Commit Graph

16019 Commits

Author SHA1 Message Date
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
Chris Morin
83522a10e1 have patchoat take directories instead of filenames
patchoat was already ignoring the basename part of the filename passed
to it for both --output-image-file and --output-image-relocation-file.
We can therefore just pass in the directories instead.

Bug: 72828459
Test: make test-art-host-gtest-patchoat_test
Change-Id: I50f2e19fec1fd27433d3e6ec82df0cfb04c43f21
2018-02-13 15:56:55 -08: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
Pirama Arumuga Nainar
9c62fef547 Merge "Pass PGO_ADDITIONAL_PROFILE_DIRS to soong" am: 73e886ec62 am: 48fa1a2d87
am: 8aaf650a40

Change-Id: I9ef128d1598e5f614e2107b61721202f7f911483
2018-02-13 21:15:18 +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
bowen_lai
4570fdbb4c Create symbolic boot vdex files for different ISAs
Create only one vdex file and share between different ISAs.
By sharing vdex file, zygote32 and zygote64 can share the same file and
the system partition size is reduced by about 32MB.

Test: make framework & check boot.vdex and boot-*.vdex files
Test: test system boots with no selinux violations

Bug: 64211239

Change-Id: I31ede4b6aa342f2047d9309b8c631217e6699202
2018-02-12 19:45:21 -08:00
Adam Seaton
a9d30a23d3 Update Security String in Master to 2018-04-05
Bug:73240847
2018-02-12 13:13:41 -08:00
Tao Bao
5232f099f6 Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))"
This reverts commit 14a3217ff9.

Reason for revert: Wrong blame for b/73143444.

Change-Id: Ibb23349fcbb3c1b855afdd426317e8d2d4fc0adc
2018-02-10 04:03:32 +00:00
Tao Bao
14a3217ff9 Revert "Replace $(shell find | sort) with $(sort $(shell find))"
This reverts commit be0b6cee4f.

Reason for revert: b/73143444

Change-Id: I51800646b816d639b40ee1f012b1bf225c04e0b6
(cherry picked from commit 586c8821083ad1bec874d6de5ab378dbb47dee58)
2018-02-09 19:05:19 -08:00
Dan Willemsen
4cdbaf1186 Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""
This reverts commit 30d6869faf.

Fixes an issue with the original change where proguard files without
newlines at the end of the file would get merged with the next file.
Most of the time the next file started with a comment, which worked
fine, but sometimes it was a syntax error.

Bug: 72969557
Test: m
Test: build on an internal tree that failed last time
Change-Id: I66f13ae80ee0f96b456e526bfbfc2cdcf82c3f3a
2018-02-09 15:22:52 -08:00
Dan Willemsen
5e81ce7c5b Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190 am: 22eb731606
am: ea121f2a9a

Change-Id: Ib5ccf90b64ff78cad702d7b91e8db51ec68d054a
2018-02-09 19:49:24 +00: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
de2d9195ff Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7 am: 7209b4066b
am: 3c508d0b3d

Change-Id: I73f796d5a53f57210f5fad53ca47bbe8af1e59f2
2018-02-09 18:51:06 +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
Dan Willemsen
4ac191d6ae Merge "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES" am: 13d389ad16 am: 02a56631d9
am: c23ffd4a3a

Change-Id: I75a14f34d453feb6e0b7f149931178b41ced6546
2018-02-09 18:26:00 +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
06f66af4e3 Merge "Don't use the same temp directory to uncompress dex" am: 9963b1af06 am: 4adb37dc4e
am: 7850bb0060

Change-Id: I3c2cea2b79615189e909a82fa003dc2fd91419af
2018-02-09 07:44:19 +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
Nan Zhang
de7a7dd43e Merge "Fixed pdk build error for pi-release" am: 3c6eaad044 am: 6145a2a2db
am: 416cf2d661

Change-Id: Id82aa8af41043b0f732c65e55fc7733872533e52
2018-02-09 07:23:45 +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
TreeHugger Robot
b6d7f7cf95 Merge "Change the naming policy of system_$(VER)" 2018-02-09 00:56:11 +00:00
Colin Cross
86a596c711 Remove art targets from PARSE_TIME_MAKE_GOALS
The art targets don't check MAKECMDGOALS any more, remove them
from PARSE_TIME_MAKE_GOALS.

Bug: 26275726
Test: m clean-oat
Test: m test-art-host-run-test-dependencies
Change-Id: I75869495c91f142bf8eff681e6e764c9b0464031
2018-02-08 16:40:35 -08: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
963369035e Merge "Compiler-rt libraries now use i386 instead of i686" am: b5751e4bd7 am: 2b6217ee17
am: 3b1315dbaa

Change-Id: If8968980b658fec51231c80be4b4763b6279f119
2018-02-08 09:37:10 +00: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
e136d21ff8 Merge "Revert "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION"" am: 835e296ce1 am: 2c95415716
am: e5f2a716cb

Change-Id: I8b5b14434356e5d7ea56a325b4c5a61dcd0aae03
2018-02-08 08:18:16 +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
Sundong Ahn
8902f5505f Change the naming policy of system_$(VER)
The name of system_$(VER) prebuilt file in droiddoc.mk and
java_common.mk was changed to sdk_v$(LOCAL_SDK_VERSION). But
system_$(VER) in apidiff.mk is not changed, since apidiff.mk
file is not in AOSP. So this modify is added and the modify
for core_current is added.

Bug: 72031391
Test: build & run on taimen
Change-Id: Ie227f4c6911fc80484f12b3f1cfa6472cb605d4b
2018-02-08 16:16:27 +09: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
1cd7012024 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES must be true for BOARD_VNDK_VERSION" am: 1e6b7c553a am: 3a9118137b
am: 2076edbd93

Change-Id: I1506cb1f26ee4879d5fec53deea2cccd6c6df4fa
2018-02-08 06:47:59 +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