Commit Graph

15331 Commits

Author SHA1 Message Date
Jaekyun Seok aabb24c3fc Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631
am: cae2ca8ef5

Change-Id: I9c5d64073d52735ae8f53bb702d6715771359583
2018-02-14 00:59:12 +00:00
Treehugger Robot 42c7cf0631 Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" 2018-02-14 00:30:23 +00:00
Adam Seaton 9f4cd386a0 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2 am: 1bdbab9542
am: 4a57b9de88

Change-Id: I16382ca753dbe46836a848b1e3224a255d5ad884
2018-02-14 00:15:41 +00:00
Adam Seaton 4a57b9de88 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
am: 1bdbab9542

Change-Id: If6a0846e43e34127265f2415a94f86cb2d5e53fb
2018-02-14 00:09:35 +00:00
Adam Seaton 1bdbab9542 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev
am: 402397c7f2

Change-Id: I56dac0e3f017fcdd57e522dccb36ab09cbb15ae2
2018-02-14 00:05:33 +00:00
Adam Seaton a540c9466b Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9 am: 05e66a80dc
am: 7231e99020

Change-Id: I9ed65a0bfddfcdd30873dff9cb683fc08d31f6dc
2018-02-14 00:01:05 +00:00
Adam Seaton 7231e99020 Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
am: 05e66a80dc

Change-Id: Ia769104e933025596c98b66598091eca3e3a860d
2018-02-13 23:54:31 +00:00
Adam Seaton 05e66a80dc Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev
am: 656fd837e9

Change-Id: Ic22c80e40cff1fe0afea3f26741d10c8a949b27b
2018-02-13 23:49:57 +00:00
Adam Seaton 312d7e7a3c [DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev
Bug:73240847
2018-02-13 21:40:38 +00:00
Adam Seaton accee92300 [DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev
Bug:73240847
2018-02-13 21:14:31 +00:00
Pirama Arumuga Nainar 8aaf650a40 Merge "Pass PGO_ADDITIONAL_PROFILE_DIRS to soong" am: 73e886ec62
am: 48fa1a2d87

Change-Id: I03b3f686736fa95d929fd3f44c65b1ab51e45ad6
2018-02-13 21:09:42 +00:00
Pirama Arumuga Nainar 676fbe7e5e Pass PGO_ADDITIONAL_PROFILE_DIRS to soong
This variable can be set in BoardConfig.mk to specify a list of
additional paths that contain PGO profiles.  These directories are
searched before the predefined paths in soong/cc/pgo.go while finding
PGO profiles.

Test: Set this variable in a BoardConfig and verify that such profiles
are found and that these paths are searched before the predefined paths
in soong/cc/pgo.go.

Change-Id: Ied3ebf0ce6e6e2ead57f4828998e9617424e4573
2018-02-13 09:32:44 -08:00
Dan Willemsen ea121f2a9a Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190
am: 22eb731606

Change-Id: Ibfa7d19f060c28bf3f44ca284275f2d6c7c7e904
2018-02-09 19:44:15 +00:00
Dan Willemsen 2744cbf190 Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" 2018-02-09 19:22:13 +00:00
Dan Willemsen 30d6869faf Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"
This reverts commit df5d7da7d8.

Reason for revert: breaking builds

Bug: 72969557
Change-Id: I27aad65587933c3f760a89c541d27469c916abe8
2018-02-09 19:21:11 +00:00
Colin Cross 3c508d0b3d Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7
am: 7209b4066b

Change-Id: If42879f1bca2c3f7ff34b57e2447ee2ce947cd70
2018-02-09 18:43:48 +00:00
Treehugger Robot 74413198b7 Merge "Move to-upper and to-lower to definitions.mk" 2018-02-09 18:20:23 +00:00
Dan Willemsen c23ffd4a3a Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" am: 13d389ad16
am: 02a56631d9

Change-Id: I3f89c666b4d3e016cc87d98ebb5a8911210c624e
2018-02-09 18:19:56 +00:00
Dan Willemsen 13d389ad16 Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" 2018-02-09 18:00:11 +00:00
Victor Hsieh 7850bb0060 Merge "Don't use the same temp directory to uncompress dex" am: 9963b1af06
am: 4adb37dc4e

Change-Id: Ic56126482827d08a0869d30b839fb08eb410870e
2018-02-09 07:38:40 +00:00
Treehugger Robot 9963b1af06 Merge "Don't use the same temp directory to uncompress dex" 2018-02-09 07:22:24 +00:00
Nan Zhang 416cf2d661 Merge "Fixed pdk build error for pi-release" am: 3c6eaad044
am: 6145a2a2db

Change-Id: I94ee6638597c44cdc8f98b44d784482bca633394
2018-02-09 07:18:08 +00:00
Colin Cross 18fae7a32e Move to-upper and to-lower to definitions.mk
So they can be used by art/test/Android.run-test.mk.

Also remove the line wrapping, which was inserting extra characters
at the beginning of the result, and add a sanity check.

Bug: 26275726
Test: no change to out/build-hikey960-test-art.ninja
Change-Id: I35b54c258a1dc76bb1a8a758ec4a08915a2b226d
2018-02-08 16:03:17 -08:00
Dan Willemsen df5d7da7d8 Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES
Packages would use proguard rules from their
LOCAL_STATIC_ANDROID_LIBRARIES, but other libraries wouldn't propagate
the rules from their LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 72969557
Test: m
Change-Id: I514af02627d78c48cf6cd08d4b3c17911c6bac2f
2018-02-08 15:31:02 -08:00
Nan Zhang f12aec3ca2 Fixed pdk build error for pi-release
due to missing header.jar, build was broken with error:
"android_stubs_current_intermediates/classes-header.jar needed by
android-support-annotations_intermediates/classes-turbine.jar,
missing and no known rule to make it"

Bug: b/72961456
Test: after check-in, I will download platform.zip to built it again.
Change-Id: I32ac8d8713ca31d27de42f87bde72185609d270c
2018-02-08 14:14:32 -08:00
Victor Hsieh 7aecf33efd Don't use the same temp directory to uncompress dex
This was ok for apk because they are in different parent directory.

Test: marlin built
Bug: 63920015
Bug: 30972906
Change-Id: I5ed00824fda9e7e0a99c825402753c21a06ba6c5
2018-02-08 13:24:56 -08:00
Yi Kong 3b1315dbaa Merge "Compiler-rt libraries now use i386 instead of i686" am: b5751e4bd7
am: 2b6217ee17

Change-Id: I2fb5e67a19a5ea46220ac443f0b72873a16cd704
2018-02-08 08:39:34 +00:00
Yi Kong b5751e4bd7 Merge "Compiler-rt libraries now use i386 instead of i686" 2018-02-08 08:21:54 +00:00
Justin Yun e5f2a716cb Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"" am: 835e296ce1
am: 2c95415716

Change-Id: I4939741c4e72c0cc6714f2c071b9a2b28fe7bc8f
2018-02-08 07:48:01 +00:00
Justin Yun fbcc2ad22e Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"
This reverts commit 69ae572779.

Reason for revert: Build breaks on aosp_car

Change-Id: I9c7f0eedf8ea8fb3b4e14dc2024dea376cc14093
2018-02-08 07:06:13 +00:00
Justin Yun 2076edbd93 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION" am: 1e6b7c553a
am: 3a9118137b

Change-Id: Id046336a2054495899610b602b50f43871f49736
2018-02-08 06:12:51 +00:00
Yi Kong cbcf11cba0 Compiler-rt libraries now use i386 instead of i686
Since Clang-4579689, crt libraries use i386 instead of i686. Update the
hardcoded paths to the new names.

Bug: 72942266
Test: N/A
Change-Id: I24f8f5742ac2fecd374fdaa3be8a11f410d31cbf
2018-02-08 14:08:44 +08:00
Justin Yun 69ae572779 PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION
If PRODUCT_TREBLE_LINKER_NAMESPACES is not true when
BOARD_VNDK_VERSION is defined, report a build error.
To enable VNDK, linker namespace must be configured.

Bug: 72704254
Test: Try to build with one of them is missing
Change-Id: I804704e2f48fa44c8f998183508741d5cc40e4ce
2018-02-08 05:53:48 +00:00
Jaekyun Seok c227ce7c25 Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of
partitions is supported. But the early-mount must be supported for full
treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be
set by default for full treble products.

Additionally this CL sets ro.vndk.version regardless of
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED.

Bug: 73078796
Test: tested with walleye
Change-Id: Icfe1b6957b55b0f9261d34d7e92db3dc5073cb58
2018-02-08 11:49:16 +09:00
Yifan Hong 95a7d377a3 Merge changes from topic "vintf_matrix_sepolicy" am: 058d6c2d1e
am: 832c80d05b

Change-Id: I0878571a42e9d49d673d3b2ca257c64793e3b5a8
2018-02-07 22:53:32 +00:00
Treehugger Robot 058d6c2d1e Merge changes from topic "vintf_matrix_sepolicy"
* changes:
  core/config.mk: Add PLATFORM_SEPOLICY_COMPAT_VERSIONS
  Move PLATFORM_SEPOLICY_VERSION from system/sepolicy/Android.mk
2018-02-07 22:32:44 +00:00
Sundong Ahn d226e81d9b Merge "Change the naming policy of system_$(VER)" am: 9f14cf2e49
am: 3826e0c889

Change-Id: Id54caf53af5fc949c800f4b74b6cc65fc3376aeb
2018-02-07 06:36:29 +00:00
Sundong Ahn 7a02001fa9 Change the naming policy of system_$(VER)
The module name of system_$(VER) prebuilt file is system_sdk_v$(VER).
But this is inconsistent with sdk_v$(LOCAL_SDK_VERSION) in prebuilts/sdk.
So, system_sdk_v$(VER) is changed to sdk_vsystem_$(VER) to use the same
naming policy.

Bug: 72031391
Test: build
Change-Id: I379c0f9aa0de7407489eeec2b07ee7727e81d69d
2018-02-07 03:37:24 +00:00
Simran Basi 605ab4554a Merge "LOCAL_HOST_REQUIRED_MODULES support" am: 9ffbc10126
am: 79a2a1e889

Change-Id: Ide6abb89c676bcf8785e60e4f798740b835cbede
2018-02-07 02:39:18 +00:00
Isaac Chen 1b9a60bae5 Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" am: b943fb63bf
am: f82423f012

Change-Id: I9616a508c120625ddd07fbed2dd5705f78e4be83
2018-02-07 02:25:23 +00:00
Treehugger Robot 9ffbc10126 Merge "LOCAL_HOST_REQUIRED_MODULES support" 2018-02-07 01:57:18 +00:00
Isaac Chen b943fb63bf Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" 2018-02-07 01:57:12 +00:00
Jiyong Park efc3f4d130 Merge "Support LOCAL_SDK_VERSION := core_current" am: c82c0a81ec
am: d2e7e0d33d

Change-Id: I032bab45c6b9cab33b13b99a4a40cba89583702f
2018-02-06 23:45:23 +00:00
Dan Willemsen 5c1bb42d60 Merge "Replace $(shell find | sort) with $(sort $(shell find))" am: 9f573a420e
am: 0991eed377

Change-Id: Ia9e6dfb7ed502dab698e7dfddd5c1de3c1651f87
2018-02-06 22:51:42 +00:00
Treehugger Robot c82c0a81ec Merge "Support LOCAL_SDK_VERSION := core_current" 2018-02-06 22:37:16 +00:00
Simran Basi 893098b06c LOCAL_HOST_REQUIRED_MODULES support
Allows target modules to directly request host modules they
require to be built and installed as well.

Bug: 72761631
Test: Added LOCAL_HOST_REQUIRED_MODULES to a target apk test and
      the host module was built.

Change-Id: I5aca11b3ba8b54676f068d337f1c9ba0e0b01997
2018-02-06 14:18:45 -08:00
Treehugger Robot 9f573a420e Merge "Replace $(shell find | sort) with $(sort $(shell find))" 2018-02-06 21:21:08 +00:00
Stephen Hines 50a02c420c Merge "Switch to clang-4579689." am: f733f896d3
am: 9144cd3fe6

Change-Id: I8075c412cd42ff7a0e4695ec519cfbc555d368df
2018-02-06 19:03:41 +00:00
Stephen Hines f733f896d3 Merge "Switch to clang-4579689." 2018-02-06 18:35:41 +00:00
James Lemieux 1e321d46a6 Merge "Clear local robolectric testing variables" am: 08ba09ed7f
am: 815658efe9

Change-Id: I09a955583e13744bc5f5d4a4c7ee16d2f8807a4f
2018-02-06 17:05:30 +00:00