Commit graph

40671 commits

Author SHA1 Message Date
Pirama Arumuga Nainar
d4a9a3281e Merge "Remove CFI-related WAR that is no longer necessary"
am: 76ceec724f

Change-Id: I17c0d41482c78bc7ae0fb762d30e82d7a13e0091
2017-11-06 18:57:18 +00:00
Treehugger Robot
76ceec724f Merge "Remove CFI-related WAR that is no longer necessary" 2017-11-06 18:54:45 +00:00
Isaac Chen
4d8e808a0b Merge "Move emulator specific configurations to vendor"
am: 8930bf679b

Change-Id: Ie2ebd2cf1ff97349d7858b3dd83751a4ec78f368
2017-11-06 06:21:25 +00:00
Isaac Chen
8930bf679b Merge "Move emulator specific configurations to vendor" 2017-11-06 06:18:04 +00:00
Pirama Arumuga Nainar
a8f75983a4 Remove CFI-related WAR that is no longer necessary
Bug: http://b/33678192

Clang has been updated past the revision mentioned in the work around.
So this is no longer necessary.

Test: Build
Change-Id: I08f8e75936bbc3527abc86ba4ce0f2c10382d332
2017-11-04 16:18:29 -07:00
Colin Cross
9159f4b08c Merge "Move BUILD_*_FROM_FILE to config.mk"
am: ab5ce7e1fe

Change-Id: I48441cd072e761147745ed7ca85c82f037f7c74a
2017-11-04 01:30:14 +00:00
Treehugger Robot
ab5ce7e1fe Merge "Move BUILD_*_FROM_FILE to config.mk" 2017-11-04 01:22:26 +00:00
Dan Willemsen
2adb61215b Merge "Switch deprecation message to $(warning)"
am: 884af82b27

Change-Id: I3a1c904ee81f938b7ed10282eac8a6c67e081f8c
2017-11-04 00:57:10 +00:00
Treehugger Robot
884af82b27 Merge "Switch deprecation message to $(warning)" 2017-11-04 00:50:14 +00:00
Colin Cross
e96bfdb337 Move BUILD_*_FROM_FILE to config.mk
BUILD_NUMBER_FROM_FILE and BUILD_DATETIME_FROM_FILE may need to
be referenced before main.mk has been parsed, move them to config.mk.

Bug: 68865363
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=Gallery
      aapt dump xmltree out/target/product/generic/obj/APPS/Gallery_intermediates/package.apk AndroidManifest.xml | grep Version
Change-Id: I9361a394469e61fcdf5a2b9509ef2bb2b373d6e7
2017-11-03 16:35:02 -07:00
Dan Willemsen
0bd793815e Add PRODUCT_ADB_KEYS
This easily allow products to add custom adb keys for debuggable builds.
To use, provide a public key created by `adb keygen` to
PRODUCT_ADB_KEYS.

This way automated test farms don't need manual intervention to
authenticate to the device over adb, but we don't disable security for
everyone else.

Add an inherit-product-if-exists hook to aosp_* targets so that our
build servers can add a key for our test farms.

Bug: 32891559
Test: lunch aosp_marlin-userdebug; m bootimage
Test: lunch aosp_marlin-user; m bootimage
Change-Id: I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67
2017-11-03 15:57:38 -07:00
Dan Willemsen
52f74821d3 Switch deprecation message to $(warning)
This way it shows up when using the old copy of lunch, which hides
stdout.

Test: source old_envsetup; lunch aosp_marlin-eng
Change-Id: I4bccf37fe69c0d7affb5805d05a2750e5d9a3da4
2017-11-03 15:52:50 -07:00
Jin Qian
bab32f2f24 Merge "Remove mkuserimg.sh from otatools"
am: 1d5f330c5b

Change-Id: I3598eb310924ab37f459e786e7a7df6ce24e9e49
2017-11-03 22:13:02 +00:00
Andreas Gampe
0f3e16aad2 Build: Enable minidebuginfo generation
Enable generation of minidebuginfo through dex2oat by default.

Test: m
Test: adb shell cmd package compile -f -a
Change-Id: I70f7a1ca4939e7992ba2a7b607e8ce9bd6e0b918
2017-11-03 14:37:32 -07:00
Treehugger Robot
1d5f330c5b Merge "Remove mkuserimg.sh from otatools" 2017-11-03 21:26:36 +00:00
Jin Qian
09f3d18d56 Remove mkuserimg.sh from otatools
It has been replaced with mkuserimg_mke2fs.sh

Bug: 64395169
Change-Id: Iff4edba35062b6ecd3fec8b65422cab2a0707d3f
2017-11-03 12:16:15 -07:00
Jin Qian
3f2bf55726 Merge "Replace make_ext4fs with mke2fs"
am: bd532fbf2e

Change-Id: Iea994024e4483f79d1560e21ddc4db7136f540c5
2017-11-03 17:39:11 +00:00
Jin Qian
bd532fbf2e Merge "Replace make_ext4fs with mke2fs" 2017-11-03 17:28:57 +00:00
Jaekyun Seok
b31b9bad66 Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be used to define system default
properties which should be installed in system partition.

Bug: 64661857
Test: confirmed that ART default properties are stored in
/system/etc/prop.default when they were defined in
PRODUCT_SYSTEM_DEFAULT_PROPERTIES.

Change-Id: Ia08c25d0c5805381c6e3fe63dd1d171e8d195b90
2017-11-03 15:32:47 +09:00
Alan Leung
ad24414dae Merge "Workaround for USE_D8 not in --dumpvars-mode"
am: 44bfeedaa3

Change-Id: Ife6c221e1e4e8181d4aab763cf758751c4af7d2a
2017-11-03 03:33:54 +00:00
Treehugger Robot
44bfeedaa3 Merge "Workaround for USE_D8 not in --dumpvars-mode" 2017-11-03 03:28:51 +00:00
Tao Bao
2b38618a62 Merge "releasetools: Fix the doctest for rangelib.py."
am: 7e85dd9dc0

Change-Id: I703e8276d1325aa69671eb48676b6e864f3fca8d
2017-11-03 00:24:06 +00:00
Treehugger Robot
7e85dd9dc0 Merge "releasetools: Fix the doctest for rangelib.py." 2017-11-03 00:18:19 +00:00
Jin Qian
95b2b695cd Replace make_ext4fs with mke2fs
make_ext4fs is deprecated and should be replaced with mke2fs

Bug: 64395169
Change-Id: Idfc8c0ee0ff598fdaa6f20bb0d4f6dca687a1b10
2017-11-02 16:27:41 -07:00
Alan Leung
65168a4143 Workaround for USE_D8 not in --dumpvars-mode
Bug: 68406220
Test: m checkbuild && USE_D8=false m checkbuild
Change-Id: Ia9916fb69b22449ff9eadd334f135807d999276f
2017-11-02 15:31:03 -07:00
Jin Qian
d4fcfea77c Merge "Always use MKE2FS to build ext4 image"
am: dee5abd85a

Change-Id: I2739bb6a533fd5161e0ab11382245e0791e29e09
2017-11-02 21:44:02 +00:00
Treehugger Robot
dee5abd85a Merge "Always use MKE2FS to build ext4 image" 2017-11-02 21:34:49 +00:00
Tao Bao
c0dcbd0017 releasetools: Fix the doctest for rangelib.py.
$ python rangelib.py
**********************************************************************
File "rangelib.py", line 323, in __main__.RangeSet.next_item
Failed example:
    list(rangelib.RangeSet("10-19 3 5 7").next_item())
Exception raised:
    Traceback (most recent call last):
      File "/usr/lib/python2.7/doctest.py", line 1315, in __run
        compileflags, 1) in test.globs
      File "<doctest __main__.RangeSet.next_item[2]>", line 1, in <module>
        list(rangelib.RangeSet("10-19 3 5 7").next_item())
    NameError: name 'rangelib' is not defined
**********************************************************************
1 items had failures:
   1 of   3 in __main__.RangeSet.next_item
***Test Failed*** 1 failures.

Test: python rangelib.py
Change-Id: I6c791ff4453f40d90b34f97b881460da9878fe64
2017-11-02 12:19:36 -07:00
Calin Juravle
3baa4a6835 Merge "Set the default value of pm.dexopt.shared to speed"
am: 1c505a1985

Change-Id: I22c7e853c7395f085c891f596b7bb73a15467e80
2017-11-02 18:21:54 +00:00
Treehugger Robot
1c505a1985 Merge "Set the default value of pm.dexopt.shared to speed" 2017-11-02 18:13:54 +00:00
Dan Willemsen
438a8b800a Merge "Revert "Add adb keys to debuggable AOSP builds""
am: 40fae9ca0f

Change-Id: I3003351ba4b043774ada2cb552895865f7e6d30e
2017-11-02 17:20:45 +00:00
Dan Willemsen
40fae9ca0f Merge "Revert "Add adb keys to debuggable AOSP builds"" 2017-11-02 17:16:48 +00:00
Calin Juravle
89836f119e Set the default value of pm.dexopt.shared to speed
By default, we should compile all shared apks with the speed filter.

(cherry picked from commit 3fdb549931)

Bug: 65591595
Test: build & boot
Merged-In: I8781ca47090321a32641ec4c7a4ed3c722bab475
Change-Id: I8781ca47090321a32641ec4c7a4ed3c722bab475
2017-11-02 09:33:39 -07:00
Tobias Thierer
e76e3837cd Revert "Add adb keys to debuggable AOSP builds"
This reverts commit 6d4536023b.

Reason for revert: Suspected to have broken build_test on master:

build/make/core/tasks/vendor_module_check.mk:108: error: Error: vendor module "adb_keys" in vendor/google/security/adb in product "aosp_lionhead" being installed to out/multiproduct-20171102103809/aosp_lionhead/target/product/lionhead/root/adb_keys which is not in the vendor tree or odm tree.

Change-Id: If7c1c9f08604b1dfc1036ea6fe3cb487fafc3cf0
2017-11-02 15:16:17 +00:00
Tobias Thierer
718de33ef9 Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true"
am: 96257655c5

Change-Id: I7501eda6c5fcb2c6f495cff71f068c3ec4015413
2017-11-02 12:42:54 +00:00
Tobias Thierer
96257655c5 Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" 2017-11-02 12:35:26 +00:00
Isaac Chen
2b063ee55d Move emulator specific configurations to vendor
The moved files are all emulator specific so should reside in vendor
directory/partition. This modification resolves a Launcher crash
issue when GSI boots on the emulator. Directly relevant file is
handheld_core_hardware.xml, which is absent from the GSI.

All other files moved in this change can cause similar issues (if they
stay under /system) since they aren't present on GSI, either.

Bug: 67987112
Test: x86 GSI boots to home screenon with 2 emulator products, aosp_x86,
      and sdk_gphone_x86 on the x86 emulator (on internal master).
      Both aosp_x86 and aosp_x86_64 boot to home screen on the emulator.
      Both aosp_arm and sdk_phone_arm boot to home screen on the arm
      emulator.

Change-Id: I2ff4f71b89d84dab322d00cf846cf06c98a1e8a7
2017-11-02 19:08:58 +08:00
Steven Moreland
531fcc2e9d Merge "Add HIDL boot-path libs to the PDK."
am: 160edc1a90

Change-Id: Icac4297a47282acadb5c71fb1fa62dab27f82671
2017-11-02 01:17:15 +00:00
Treehugger Robot
160edc1a90 Merge "Add HIDL boot-path libs to the PDK." 2017-11-02 01:10:31 +00:00
Dan Willemsen
ccdbf9866c Merge "Add adb keys to debuggable AOSP builds"
am: 40cd480454

Change-Id: Ib3c254058d07d5e94a998ee2c5b37634ab0b32b6
2017-11-02 00:59:46 +00:00
Treehugger Robot
40cd480454 Merge "Add adb keys to debuggable AOSP builds" 2017-11-02 00:50:22 +00:00
Colin Cross
f14caaec79 Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong"
am: cce2ea423a

Change-Id: I4584ddd9fc8c8c6c578e761bcff8fddaf22dffde
2017-11-02 00:11:20 +00:00
Colin Cross
cce2ea423a Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong" 2017-11-02 00:05:20 +00:00
Jin Qian
f0ebe872a2 Always use MKE2FS to build ext4 image
Bug: 64395169
Change-Id: I0118fe8ee5f677fdb9da616a11de304b2aefd0ba
2017-11-01 16:37:38 -07:00
Steven Moreland
58dbc79468 Add HIDL boot-path libs to the PDK.
Adding:
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java-static_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \

Ref b/68767391. Currently, Soong java things cannot
build against things in the PDK.

Bug: 68433855
Test: platform.zip contains the 3 added intermediates
Change-Id: I18c556e7f535d9ab8f385b67ae217a2ce2eb8049
2017-11-01 16:27:01 -07:00
Vishwath Mohan
5bff3823c3 Merge "Revert "Revert "CFI compatibility with static executables and nested archives"""
am: fba0a560de

Change-Id: Ib8eb5180a3f6d988f13f7d166a90beeeed302bb4
2017-11-01 22:56:08 +00:00
Treehugger Robot
fba0a560de Merge "Revert "Revert "CFI compatibility with static executables and nested archives""" 2017-11-01 22:16:00 +00:00
Dan Willemsen
6d4536023b Add adb keys to debuggable AOSP builds
These don't exist on AOSP itself, but if they're added in, debuggable
builds will include the keys. This way automated test farms don't need
manual intervention to authenticate to the device over adb, but we don't
disable security for everyone else.

Bug: 32891559
Test: lunch aosp_marlin-userdebug; m
Change-Id: I59011a5c1f45b0c8bd5c2355d2b4c3671f5da4e4
2017-11-01 15:04:11 -07:00
allenhair
c6cfede3fe Merge "Fix coverage build."
am: e0a367384d

Change-Id: I638e8be1e8f028475446fa4716cf575e70b91294
2017-11-01 17:34:48 +00:00
allenhair
e0a367384d Merge "Fix coverage build." 2017-11-01 17:22:16 +00:00