Commit Graph

63294 Commits

Author SHA1 Message Date
Anton Hansson
c92fc3ff9f Remove vendor/... path checks DO NOT MERGE am: e6c24147f0 am: da72204d91 am: c7a5f49068
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: Ib36164b53b8df03e1cc8ceade5b58db5730ac4e4
2020-07-02 09:57:49 +00:00
Anton Hansson
e0bd5d6242 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0 am: 24b6156ffd am: 392ee52c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: If7a65348ba0870999ffc9b5f95641b27534b5428
2020-07-02 09:57:29 +00:00
Anton Hansson
c7a5f49068 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0 am: da72204d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I6b3fdaf56b16a1dffecbc5aa4a986495e9dc3522
2020-07-02 09:45:15 +00:00
Anton Hansson
392ee52c73 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0 am: 24b6156ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I4452baddd4a1d3455d62c88177e8ac1eee283414
2020-07-02 09:44:59 +00:00
Anton Hansson
da72204d91 Remove vendor/... path checks DO NOT MERGE am: e6c24147f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I5c4e882eba712f31e445bee5c8044a10f791d67a
2020-07-02 09:32:23 +00:00
Anton Hansson
24b6156ffd Remove vendor/... path checks DO NOT MERGE am: e6c24147f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I0d2cc129132595a708ade71a1615ea8d0489c4dd
2020-07-02 09:32:10 +00:00
Treehugger Robot
55c896061f Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa am: 03c37a44fa am: 9a130f0478 am: 025d6f1a4d
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: Idf94b3a68eeb3a834475cb1b22e2ee7a74a125f0
2020-07-02 03:13:47 +00:00
Treehugger Robot
025d6f1a4d Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa am: 03c37a44fa am: 9a130f0478
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: I26ae6aa01488ca8bb58e8c5c37127fa456453156
2020-07-02 02:55:31 +00:00
Treehugger Robot
9a130f0478 Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa am: 03c37a44fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: I35950eb2c34c6b1db01c140a1240a8b06aad9669
2020-07-02 02:39:05 +00:00
Treehugger Robot
03c37a44fa Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: I595981758ea45d8646567c13963e3bf79e9535a2
2020-07-02 02:29:20 +00:00
Treehugger Robot
0ee038dffa Merge "Dedup lists of NDK libraries from Soong." 2020-07-02 02:12:26 +00:00
Treehugger Robot
e9cd8b4b14 Merge "rbe: Remove stray /" am: 13bf168b68 am: 72392527eb am: 8792ac83ff am: 9bdea6c923
Original change: https://android-review.googlesource.com/c/platform/build/+/1334776

Change-Id: I0e89f1938f6e5c78813bb90e0aa49e951f60f22b
2020-07-02 00:28:27 +00:00
Treehugger Robot
9bdea6c923 Merge "rbe: Remove stray /" am: 13bf168b68 am: 72392527eb am: 8792ac83ff
Original change: https://android-review.googlesource.com/c/platform/build/+/1334776

Change-Id: I3277f7dca7a67d7f03f9819c9aa8b8bae1361fe8
2020-07-02 00:13:25 +00:00
Treehugger Robot
8792ac83ff Merge "rbe: Remove stray /" am: 13bf168b68 am: 72392527eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1334776

Change-Id: I6400421248bc593bee8def000238eea5fc45519b
2020-07-01 23:49:31 +00:00
Treehugger Robot
72392527eb Merge "rbe: Remove stray /" am: 13bf168b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1334776

Change-Id: If4148da9e6a83444f6e4de3ab362a90bcb015357
2020-07-01 23:34:48 +00:00
Treehugger Robot
13bf168b68 Merge "rbe: Remove stray /" 2020-07-01 23:13:05 +00:00
Treehugger Robot
1e803e9a27 [automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca am: 0e66a44a3c -s ours am: cd5493f296 -s ours am: fe75c40c4b -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I93b66477685a0a383b9bfdf86ce397eb8d5f875c
2020-07-01 20:40:42 +00:00
Treehugger Robot
fe75c40c4b [automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca am: 0e66a44a3c -s ours am: cd5493f296 -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I37b5abd72e4c1bc9291af00f3456ba8d12227186
2020-07-01 20:29:23 +00:00
Treehugger Robot
cd5493f296 [automerger skipped] Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca am: 0e66a44a3c -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I858ddbddc067c7a994eef3c208d307162ce79800
2020-07-01 20:16:00 +00:00
Treehugger Robot
0e66a44a3c Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca
Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I67a393443ca8f85ca82d086c4b92936b6b6ac9b3
2020-07-01 20:04:18 +00:00
Treehugger Robot
fd75d8deca Merge "Add LOCAL_APKCERTS_FILE support." 2020-07-01 19:53:32 +00:00
Jaewoong Jung
704b454ca1 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Fixes: 160119159
Test: m apkcerts-list
Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-07-01 10:01:16 -07:00
Treehugger Robot
e689df056c Merge "Rename the Default* constants in java/config." am: dada4c090a am: 8677976225 am: 37f9f3fe34 am: c9d5c1b9e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1353607

Change-Id: I9153e1735c60afb2de5a8c550dd0ee9cc100694b
2020-07-01 15:54:19 +00:00
Treehugger Robot
c9d5c1b9e9 Merge "Rename the Default* constants in java/config." am: dada4c090a am: 8677976225 am: 37f9f3fe34
Original change: https://android-review.googlesource.com/c/platform/build/+/1353607

Change-Id: I045837c9acfa446b52c2d01b7611dcbc083dc48f
2020-07-01 15:44:06 +00:00
Treehugger Robot
37f9f3fe34 Merge "Rename the Default* constants in java/config." am: dada4c090a am: 8677976225
Original change: https://android-review.googlesource.com/c/platform/build/+/1353607

Change-Id: I7b0ebf495c0423c57e7edfbf16a6a0bd92116db8
2020-07-01 15:25:53 +00:00
Treehugger Robot
8677976225 Merge "Rename the Default* constants in java/config." am: dada4c090a
Original change: https://android-review.googlesource.com/c/platform/build/+/1353607

Change-Id: I7ae19adc4ade3913c8acb3f2424ff7a25ebe6329
2020-07-01 14:56:57 +00:00
Treehugger Robot
dada4c090a Merge "Rename the Default* constants in java/config." 2020-07-01 14:43:46 +00:00
Anton Hansson
e6c24147f0 Remove vendor/... path checks DO NOT MERGE
The vendor path check is incompatible with the current setup of prebuilt
module stubs.

Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
2020-07-01 15:27:37 +01:00
Pete Gillin
3829475b74 Rename the Default* constants in java/config.
These values are used in two out of the many possible sdk_version
configurations, and therefore weren't really defaults in any
meaningful sense. Giving them more descriptive names makes the code
easier to follow.

Bug: 157640067
Test: m java
Change-Id: I67767b2be72ed3d8cc879280036850096eb65415
2020-07-01 12:47:02 +01:00
Treehugger Robot
0ebb11a175 [automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba am: 7f28fe4e5b -s ours am: dadc1cc5e2 -s ours am: 436e48221e -s ours
am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d40 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353435

Change-Id: Icdcca2dc460cf0344cae241e3ba9a8d56feca1b0
2020-07-01 09:45:18 +00:00
Treehugger Robot
436e48221e [automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba am: 7f28fe4e5b -s ours am: dadc1cc5e2 -s ours
am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d40 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353435

Change-Id: I7bf3e58d8108349a6b423cc03b12305051fa3d37
2020-07-01 09:33:17 +00:00
Treehugger Robot
dadc1cc5e2 [automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba am: 7f28fe4e5b -s ours
am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d40 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353435

Change-Id: I95bb74e492d4fc8df62bb87c9282354c1ae9f0ec
2020-07-01 09:20:12 +00:00
Treehugger Robot
7f28fe4e5b Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." am: 92346502ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1353435

Change-Id: Ib5af919482a89f5f5bab703f848c092249f11f17
2020-07-01 09:01:03 +00:00
Treehugger Robot
92346502ba Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." 2020-07-01 08:39:42 +00:00
Jiyong Park
974c924e82 [automerger skipped] Merge changes from topic "sysprop" am: dd3af422a2 am: 326f1b5b2e -s ours am: e7ac8c0155 -s ours am: 7b43b4dfd8 -s ours
am skip reason: Change-Id Iba9b61d9779d93e86d9bead2286f945f8d51ab1d with SHA-1 5df5873d26 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353428

Change-Id: Ia58c2aa44fb82c14d8151e866be9453f5ad69b2b
2020-07-01 02:53:23 +00:00
Jiyong Park
fad7dd7308 [automerger skipped] BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction am: 0b4fccb66d am: 9803361a98 -s ours am: cfc7fb1ff0 -s ours am: a68c2ed8c4 -s ours
am skip reason: Change-Id I7bdfffd47d50aad66a78e28a30c3dad7ebac080c with SHA-1 58cf0e095c is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353427

Change-Id: I2c37b2439e9ff8aa4c8e4e022c18e3cf615b59a6
2020-07-01 02:53:21 +00:00
Jiyong Park
137ec85718 [automerger skipped] pm.dexopt.* props in runtime_libart.mk becomes optional am: 85471ed82e am: 47d50f51b1 -s ours am: b884d1ab11 -s ours am: b34145c3ec -s ours
am skip reason: Change-Id I044486d313d699607cd54222ae34d9eae24762b9 with SHA-1 8af29d4ec0 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1347182

Change-Id: I89343f2b9a7dabf03d2f1d42ba3a0afff28b1866
2020-07-01 02:53:20 +00:00
Jiyong Park
96f21abfbb [automerger skipped] Some properties are set as optional am: 19746f4686 am: 30ab9d1904 -s ours am: 424864237e -s ours am: 6ea63976a4 -s ours
am skip reason: Change-Id Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90 with SHA-1 7b933fb576 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344823

Change-Id: I85f9b9e1e68a8fec8b43b56df9f6d3eb23f2c7e1
2020-07-01 02:53:18 +00:00
Jiyong Park
ef60500c77 [automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2c8 am: b4233d19e8 -s ours am: eb3e2fdf4b -s ours am: bd07bf3f25 -s ours
am skip reason: Change-Id Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4 with SHA-1 b00931e7eb is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344822

Change-Id: I9384ce1b78c2b5eb7a08d1ab75d5027680785fd8
2020-07-01 02:53:17 +00:00
Jiyong Park
2c07210ef8 [automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9 am: 44fda3e29e -s ours am: e69116105b -s ours am: d5b9422535 -s ours
am skip reason: Change-Id I4d1e2f819fe688a4a85e58387b6af58d603399d3 with SHA-1 6ce12029b0 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344821

Change-Id: I2b1e68f5d350da0ada47923cd0e0b1316e42a73f
2020-07-01 02:53:15 +00:00
Jiyong Park
d6f02d670b [automerger skipped] Support optional prop assignments am: d721e870bc am: 54403635a4 -s ours am: ec1d03db26 -s ours am: 127b35daa7 -s ours
am skip reason: Change-Id I9c073a21c8257987cf2378012cadaeeeb698a4fb with SHA-1 598ea49881 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344820

Change-Id: I0eada9515da81d6838089c3969c14ce48608a668
2020-07-01 02:53:13 +00:00
Jiyong Park
7b43b4dfd8 [automerger skipped] Merge changes from topic "sysprop" am: dd3af422a2 am: 326f1b5b2e -s ours am: e7ac8c0155 -s ours
am skip reason: Change-Id Iba9b61d9779d93e86d9bead2286f945f8d51ab1d with SHA-1 5df5873d26 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353428

Change-Id: If7037588431c0d8401b9959b3527ecd255ee0e07
2020-07-01 02:27:10 +00:00
Jiyong Park
a68c2ed8c4 [automerger skipped] BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction am: 0b4fccb66d am: 9803361a98 -s ours am: cfc7fb1ff0 -s ours
am skip reason: Change-Id I7bdfffd47d50aad66a78e28a30c3dad7ebac080c with SHA-1 58cf0e095c is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1353427

Change-Id: I91232e6417188a074a4874013afa09b5a337fcf1
2020-07-01 02:27:08 +00:00
Jiyong Park
b34145c3ec [automerger skipped] pm.dexopt.* props in runtime_libart.mk becomes optional am: 85471ed82e am: 47d50f51b1 -s ours am: b884d1ab11 -s ours
am skip reason: Change-Id I044486d313d699607cd54222ae34d9eae24762b9 with SHA-1 8af29d4ec0 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1347182

Change-Id: Ib42f985c0bb30411cc7e95ee498d96d244609ee8
2020-07-01 02:27:06 +00:00
Jiyong Park
6ea63976a4 [automerger skipped] Some properties are set as optional am: 19746f4686 am: 30ab9d1904 -s ours am: 424864237e -s ours
am skip reason: Change-Id Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90 with SHA-1 7b933fb576 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344823

Change-Id: Iba89ce685ffd30b6fc3df14c56ac9e0d33647083
2020-07-01 02:27:04 +00:00
Jiyong Park
bd07bf3f25 [automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2c8 am: b4233d19e8 -s ours am: eb3e2fdf4b -s ours
am skip reason: Change-Id Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4 with SHA-1 b00931e7eb is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344822

Change-Id: I2e2975a4f173f59f6eb173f72ffa32db8bc47257
2020-07-01 02:27:02 +00:00
Jiyong Park
d5b9422535 [automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9 am: 44fda3e29e -s ours am: e69116105b -s ours
am skip reason: Change-Id I4d1e2f819fe688a4a85e58387b6af58d603399d3 with SHA-1 6ce12029b0 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344821

Change-Id: I3b1100e816159f043a10a429932fb00d36d603f0
2020-07-01 02:27:00 +00:00
Jiyong Park
127b35daa7 [automerger skipped] Support optional prop assignments am: d721e870bc am: 54403635a4 -s ours am: ec1d03db26 -s ours
am skip reason: Change-Id I9c073a21c8257987cf2378012cadaeeeb698a4fb with SHA-1 598ea49881 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344820

Change-Id: I7aca05a3840c7fc39e88d90d749e4de07846fea5
2020-07-01 02:26:58 +00:00
Automerger Merge Worker
a570646719 [automerger skipped] Merge "Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd" into rvc-dev-plus-aosp am: e1b8dc59bb -s ours am: 7eb9f78934 -s ours
am skip reason: Change-Id Ifb3886396fe65dcdaeba16c568419b9fa084193d with SHA-1 6924eb7d40 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901

Change-Id: Icc4346c809bcf1dd59d72a7c3b84a5e442aee7d9
2020-07-01 02:21:28 +00:00
Treehugger Robot
a6b79f129e Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11 am: 91fd2d719e am: 1a74423603 am: 451a5fcdb3
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282

Change-Id: Iefac39791732b619a2db83dce60ab57b1ee94f48
2020-07-01 02:21:19 +00:00