Yifan Hong
8a61f0e4da
[automerger skipped] Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
am: 0d42f2f284
am: 6753c0ebeb
-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: I0d3e90312dbd89ddca1296d3f7b30635048ea6cd
2020-07-01 02:21:05 +00:00
Yifan Hong
a9dff13d11
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
am: 0d42f2f284
am: 3b47bc2b63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901
Change-Id: I698228e1860df3f659fbdb2e819d1cd58906fc1b
2020-07-01 02:20:49 +00:00
Jiyong Park
e7ac8c0155
[automerger skipped] Merge changes from topic "sysprop" am: dd3af422a2
am: 326f1b5b2e
-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: Id6cfac02187d095be705d381e3faf2b3a9b98cd6
2020-07-01 02:13:59 +00:00
Jiyong Park
cfc7fb1ff0
[automerger skipped] BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction am: 0b4fccb66d
am: 9803361a98
-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: Ia220abf722c6bf897f13a4a4452f297b460fe88a
2020-07-01 02:13:57 +00:00
Jiyong Park
b884d1ab11
[automerger skipped] pm.dexopt.* props in runtime_libart.mk becomes optional am: 85471ed82e
am: 47d50f51b1
-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: I1a8b222058f5892c34f5ab5ca1d37ef6c73def87
2020-07-01 02:13:54 +00:00
Jiyong Park
424864237e
[automerger skipped] Some properties are set as optional am: 19746f4686
am: 30ab9d1904
-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: I8f1037146e2b2af2c292e348e4ce6d9aecd47571
2020-07-01 02:13:53 +00:00
Jiyong Park
eb3e2fdf4b
[automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2c8
am: b4233d19e8
-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: I002bdf7879300a247c2f7bd86bd42484de3b0963
2020-07-01 02:13:49 +00:00
Jiyong Park
e69116105b
[automerger skipped] Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9
am: 44fda3e29e
-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: Ifb1302ff3649c1536d21488211a744546b9fac03
2020-07-01 02:13:47 +00:00
Jiyong Park
ec1d03db26
[automerger skipped] Support optional prop assignments am: d721e870bc
am: 54403635a4
-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: I810409d13e05db21d11d5fb9912d6ee3bd50cead
2020-07-01 02:13:43 +00:00
Yifan Hong
6753c0ebeb
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
am: 0d42f2f284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901
Change-Id: I40ce7637f6fca89f2e06420c3fc8be5bd5d00f6c
2020-07-01 02:03:09 +00:00
Automerger Merge Worker
7eb9f78934
[automerger skipped] Merge "Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd" into rvc-dev-plus-aosp am: e1b8dc59bb
-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: Ia00239f8a4c6f23d20441a77e316b89331ea5731
2020-07-01 02:03:08 +00:00
Treehugger Robot
451a5fcdb3
Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11
am: 91fd2d719e
am: 1a74423603
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282
Change-Id: I714ae3d8357f9cca9929e678513744a66b75df9e
2020-07-01 02:02:59 +00:00
Yifan Hong
3b47bc2b63
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
am: 0d42f2f284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901
Change-Id: Ib64759e69cfd8dad43319845f6d1cb8f661660e2
2020-07-01 02:02:47 +00:00
Jiyong Park
326f1b5b2e
Merge changes from topic "sysprop" am: dd3af422a2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1353428
Change-Id: Iafa71c359c50c312fd79d345e3fae4d7812f7580
2020-07-01 01:59:30 +00:00
Jiyong Park
9803361a98
BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction am: 0b4fccb66d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1353427
Change-Id: If3c457d46ef0a293417ea2b8255f5b841754d0d1
2020-07-01 01:59:28 +00:00
Jiyong Park
47d50f51b1
pm.dexopt.* props in runtime_libart.mk becomes optional am: 85471ed82e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1347182
Change-Id: Id5b74a7aa077a9a2b9c5377ae340ab6a96952b0c
2020-07-01 01:59:27 +00:00
Jiyong Park
30ab9d1904
Some properties are set as optional am: 19746f4686
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1344823
Change-Id: I508c0eb6ad7fd6f2c15e638a3d0e623a5ef0022c
2020-07-01 01:59:25 +00:00
Jiyong Park
b4233d19e8
ro.zygote in base_system.mk is optional am: 8d521ec2c8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1344822
Change-Id: Idbd471ae8ac6883c81b457aa30d9943a312f8f2c
2020-07-01 01:59:24 +00:00
Jiyong Park
44fda3e29e
Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1344821
Change-Id: Ide2740f539da8ae56f02728828741e026e4f9599
2020-07-01 01:59:22 +00:00
Jiyong Park
54403635a4
Support optional prop assignments am: d721e870bc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1344820
Change-Id: I22fbe3645aff1b61a7e42d374cca240e9fe2259a
2020-07-01 01:59:20 +00:00
Automerger Merge Worker
e1b8dc59bb
Merge "Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd" into rvc-dev-plus-aosp
2020-07-01 01:48:21 +00:00
Yifan Hong
c8afa54838
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901
Change-Id: Ib30dd8adc20af705060d2e5633641d759f363d3b
2020-07-01 01:48:17 +00:00
Treehugger Robot
1a74423603
Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11
am: 91fd2d719e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282
Change-Id: I1e2ef5b0589ffa1a95d31f99c6f73a57b5d8cd5f
2020-07-01 01:48:14 +00:00
Yifan Hong
0d42f2f284
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901
Change-Id: Ie6365053a835b8f648ef76939a808848aed3390f
2020-07-01 01:48:11 +00:00
Jiyong Park
dd3af422a2
Merge changes from topic "sysprop"
...
* changes:
Handle the case when non-optional props have the same value
BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction
pm.dexopt.* props in runtime_libart.mk becomes optional
Some properties are set as optional
ro.zygote in base_system.mk is optional
Don't inherit tablet-dalvik-heap for GSI and emulator
Support optional prop assignments
2020-07-01 01:46:47 +00:00
Yifan Hong
2206bb29fd
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev
2020-07-01 01:38:10 +00:00
P.Adarsh Reddy
1ed2d66259
Fix up _CheckSecondTokenNotSlotSuffixed function.
...
Incremental OTA generation was failing since the
function _CheckSecondTokenNotSlotSuffixed was in
broken state, this change fixes the same.
Bug: 160215626
Test: Incremental OTA now gets generated and applied
successfully a non-ab device.
Change-Id: Ifb3886396fe65dcdaeba16c568419b9fa084193d
Merged-In: Ifb3886396fe65dcdaeba16c568419b9fa084193d
2020-07-01 01:37:56 +00:00
Treehugger Robot
91fd2d719e
Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282
Change-Id: Id5cd098b19f9bb97dc3f692f3004c6e878fc1b1b
2020-07-01 01:36:00 +00:00
Inseob Kim
2c311b056c
Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d
am: 572072b09f
am: 3105f78ef6
am: 770c779f64
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002
Change-Id: Ic17467625d4b5c6b71f93f64dc272595558604d0
2020-07-01 01:18:20 +00:00
Treehugger Robot
3a3d501e11
Merge "build.prop for ODM partition is under ./etc subdir"
2020-07-01 01:16:44 +00:00
Inseob Kim
770c779f64
Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d
am: 572072b09f
am: 3105f78ef6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002
Change-Id: Iddaab6090e20c258a90ec80ac16a3faf3bf6ccb2
2020-07-01 01:08:01 +00:00
Jaewoong Jung
61cc05200e
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: f296209f3a
am: 85b9e4eceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: I474dbe47df4e5ca0e4a43dfdc4300ce1c6d99913
2020-07-01 00:53:26 +00:00
Jaewoong Jung
04b8fb7c0d
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: b46b86c1f7
am: f3ba61efbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: I1e27931bbe16a7620f05db17d5e82a3aa90372b3
2020-07-01 00:53:13 +00:00
Inseob Kim
3105f78ef6
Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d
am: 572072b09f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002
Change-Id: Id4c7697f2812d80fb17ea9ca30fa120564a2caea
2020-07-01 00:53:09 +00:00
Jaewoong Jung
e337aacbca
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: f296209f3a
am: 3c908c3975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: I060c2c85ad9f991ee4851ee542b00193f7070429
2020-07-01 00:52:57 +00:00
Jaewoong Jung
f3ba61efbe
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: b46b86c1f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: Ie051fb21bf2eb96fc27a9d0e9fb6bc9e6e98966d
2020-07-01 00:38:13 +00:00
Jaewoong Jung
85b9e4eceb
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: f296209f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: Ief76ed3733dd1da250968669f276a8e1134dbfb8
2020-07-01 00:38:05 +00:00
Inseob Kim
572072b09f
Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002
Change-Id: I7e35dc40a4905f53b4106f4aeeae4d7c3cb114de
2020-07-01 00:38:04 +00:00
Jaewoong Jung
3c908c3975
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
am: f296209f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: Id82c055879673047d218326f9e08a092889a2ee7
2020-07-01 00:37:50 +00:00
Inseob Kim
b9a27f4e7d
Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION"
2020-07-01 00:27:44 +00:00
Jaewoong Jung
b46b86c1f7
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: I8a2fce4420e8b5cfdc320e45af002fe12fee74d7
2020-07-01 00:23:47 +00:00
Jaewoong Jung
f296209f3a
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309
Change-Id: I066d94161b1569b7d4e8d774dbd2c39c3112ff0d
2020-07-01 00:23:44 +00:00
Jaewoong Jung
d1198b74b5
Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev
2020-07-01 00:06:23 +00:00
P.Adarsh Reddy
6924eb7d40
Fix up _CheckSecondTokenNotSlotSuffixed function.
...
Incremental OTA generation was failing since the
function _CheckSecondTokenNotSlotSuffixed was in
broken state, this change fixes the same.
Bug: 160215626
Test: Incremental OTA now gets generated and applied
successfully a non-ab device.
Change-Id: Ifb3886396fe65dcdaeba16c568419b9fa084193d
(cherry picked from commit 52defe48d52a770c326f489357ab8877b211541e)
Merged-In: Ifb3886396fe65dcdaeba16c568419b9fa084193d
2020-06-30 14:49:04 -07:00
Dan Albert
016da58c3c
Dedup lists of NDK libraries from Soong.
...
Test: treehugger
Bug: None
Change-Id: I56bca0e8dc6d42a7107ac421d0b608a533e38580
2020-06-30 12:46:41 -07:00
Treehugger Robot
b27f90547f
Merge "use first kernel when generating kernel configs file" am: 6c9441a924
am: e68d12bad2
am: 2dc8f68e46
am: f2c2293d83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284
Change-Id: Iae404996101b5a830338d56546172f76f423eacb
2020-06-30 18:46:43 +00:00
Treehugger Robot
f2c2293d83
Merge "use first kernel when generating kernel configs file" am: 6c9441a924
am: e68d12bad2
am: 2dc8f68e46
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284
Change-Id: I2b4550b498deca5147021057732bee0c91fe718f
2020-06-30 18:33:18 +00:00
Treehugger Robot
2dc8f68e46
Merge "use first kernel when generating kernel configs file" am: 6c9441a924
am: e68d12bad2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284
Change-Id: Ia94583456eabca2b23554fd8b5f1c44e50181178
2020-06-30 18:07:25 +00:00
Treehugger Robot
e68d12bad2
Merge "use first kernel when generating kernel configs file" am: 6c9441a924
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284
Change-Id: Iaa8c1c82e75b1c27c36dd6f845e70073d3a34539
2020-06-30 17:55:55 +00:00
Treehugger Robot
6c9441a924
Merge "use first kernel when generating kernel configs file"
2020-06-30 17:36:01 +00:00