Commit graph

70152 commits

Author SHA1 Message Date
Anton Hansson
1da778ce91 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I6f08948fe90e9a9400cd5e47eaa3f575b2ff9553
2021-04-22 14:00:20 +00:00
Anton Hansson
ae6fb60a0b Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I4d7e7667708d17cbb9fcf4a466d1760f361a2607
2021-04-22 13:34:08 +00:00
Anton Hansson
4daa3fb610 Merge "Set VNDK version to current for module builds" am: 85c91dcee9
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: Ifba21bd03ef307695991ba32cc2f453d3c1fd012
2021-04-22 13:10:19 +00:00
Anton Hansson
85c91dcee9 Merge "Set VNDK version to current for module builds" 2021-04-22 12:51:39 +00:00
Paul Scovanner
0b51b5a247 [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours am: 04d11f3704 -s ours am: 1eef03460b -s ours am: acceeff3f4 -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: I98bcb79b262bbe0a0e18e92e470e32fc50d91855
2021-04-22 02:28:17 +00:00
Paul Scovanner
1f1b16f47c [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours am: 04d11f3704 -s ours am: 6fdc6ff7f0 -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: I2f2125b9b57a74af7fb4d69860ed81da12779ba0
2021-04-22 02:18:26 +00:00
Paul Scovanner
acceeff3f4 [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours am: 04d11f3704 -s ours am: 1eef03460b -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: I3d34b6eba3684a3e1ef1552239080f4803ec2a50
2021-04-22 02:05:48 +00:00
Paul Scovanner
6fdc6ff7f0 [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours am: 04d11f3704 -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: Ie59152896f883bc7de0100ab4e177630b5c3b532
2021-04-22 01:34:32 +00:00
Paul Scovanner
1eef03460b [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours am: 04d11f3704 -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: I8a3fa8be36e1f22f77528002d7bc52c96447813c
2021-04-22 01:32:52 +00:00
Paul Scovanner
04d11f3704 [automerger skipped] Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1 am: 71374cceaa -s ours
am skip reason: skip tag Change-Id Ibfaf0bcc7e4525786eca62cafc7548030be40c61 with SHA-1 deaeaecae3 is already in history

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

Change-Id: I85fb19135e770cd2f530e279c223534dc71bb87f
2021-04-22 01:12:28 +00:00
Colin Cross
01eabbe6a4 Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb am: 8875d060db am: bec8ecf507
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I3ec4e39748865547d50175f623f25ac44cb3c8cc
2021-04-22 01:03:17 +00:00
Paul Scovanner
71374cceaa Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a am: f492dd2df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14269285

Change-Id: I069744d38b3f25ca3d6c5cbd470a97b904a7efeb
2021-04-22 00:51:27 +00:00
Colin Cross
bec8ecf507 Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb am: 8875d060db
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I13d275faae249f10daf4e721a966c10ebb704c17
2021-04-22 00:29:05 +00:00
Paul Scovanner
f492dd2df1 Update Security String to 2021-06-01 am: 7cd828d214 am: 689bf4f28a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14269285

Change-Id: If4e505890f22cb5d6cf8018f4ff1a8c33b88fe9e
2021-04-22 00:19:55 +00:00
Colin Cross
8875d060db Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I9ce079644c063667a2a834ead33926799171379c
2021-04-22 00:08:42 +00:00
Paul Scovanner
689bf4f28a Update Security String to 2021-06-01 am: 7cd828d214
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14269285

Change-Id: Iff9f116681b8bd6e15210f3c245bfffa098a755f
2021-04-21 23:57:45 +00:00
Colin Cross
37b11b8cfb Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" 2021-04-21 23:15:40 +00:00
Paul Scovanner
7cd828d214 Update Security String to 2021-06-01
Bug: 185154903

Change-Id: I9931ce41d6d8c7249f41174868f57b93d6aee128
Merged-In: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
2021-04-21 18:45:30 +00:00
Anton Hansson
3a951869de Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673 am: 8b5677a3f0 am: c4477b5dec
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: I79db70dd014da74bd0cad35edacf0d7372b625b7
2021-04-21 15:46:51 +00:00
Anton Hansson
c4477b5dec Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673 am: 8b5677a3f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: Ic872da7e2349d0c47c56cea554ffe84967d3ccec
2021-04-21 15:20:05 +00:00
Anton Hansson
8b5677a3f0 Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: Iaf3d9875efe272ef523fe9f38776121239eb8326
2021-04-21 14:57:02 +00:00
Anton Hansson
8454b6eb5c Merge "Enable CFI for media module paths in module_*" am: e50287e1b5 am: 9e3c0982e7 am: 24df70f1ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: I80e94d47e55c03f615b8c1709671b08776a646f6
2021-04-21 14:47:04 +00:00
Anton Hansson
e6c0eee673 Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" 2021-04-21 14:32:15 +00:00
Anton Hansson
d0871073ab Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-21 14:31:47 +00:00
Anton Hansson
24df70f1ae Merge "Enable CFI for media module paths in module_*" am: e50287e1b5 am: 9e3c0982e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: Ic0b44fab5014abd7061660336e47d20570295914
2021-04-21 14:18:04 +00:00
Anton Hansson
9e3c0982e7 Merge "Enable CFI for media module paths in module_*" am: e50287e1b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: I191fb0f6f3d61b28ff9937cd439753614fe01460
2021-04-21 13:53:25 +00:00
Anton Hansson
e50287e1b5 Merge "Enable CFI for media module paths in module_*" 2021-04-21 13:29:59 +00:00
Anton Hansson
f7ac2d31d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-21 10:19:28 +01:00
Anton Hansson
d7995cc8e7 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-21 09:58:51 +01:00
Treehugger Robot
121479acb3 Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea am: f44effaaa5 am: 7fb15eb21c
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424

Change-Id: Ibf754fee03f898156422c118d9b27ad77ffe1cf7
2021-04-21 00:54:19 +00:00
Treehugger Robot
7fb15eb21c Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea am: f44effaaa5
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424

Change-Id: Ic28a3fd29989b6785108326933998750ca34fc9f
2021-04-21 00:28:18 +00:00
Treehugger Robot
f44effaaa5 Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424

Change-Id: I6b7323787148b183e32387c129bf9d63eed78ca9
2021-04-20 23:53:06 +00:00
Treehugger Robot
50a00289ea Merge "Performs basic APEX validation in the merged target files package." 2021-04-20 23:32:31 +00:00
Colin Cross
e85c66ccea Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS
module-lib and system-server are not supported in Make, remove them
from TARGET_AVAILABLE_SDK_VERSIONS.

Also replace the hardcoded test_current version with the one found in
the prebuilts.

Fixes: 185903998
Test: get_build_var TARGET_AVAILABLE_SDK_VERSIONS
Change-Id: I745fbcf019092ec27a9903c48fdb95e892c02e3e
2021-04-20 10:18:37 -07:00
Treehugger Robot
9c612a36eb Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454 am: ab9ffa8fed
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Idda39045f8a58b6abe55b09e2ca934643b4603af
2021-04-20 13:47:58 +00:00
Treehugger Robot
ab9ffa8fed Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Ia803969654c14c653c2c4f439d9a725c217f7e1b
2021-04-20 13:20:58 +00:00
Treehugger Robot
bcc08a2454 Merge "Test changes for build support for test jni_libs" am: f3162034ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: If8fdc985ad1fe4a1c0a0f1fe3b593c6b18f34676
2021-04-20 12:58:09 +00:00
Martin Stjernholm
ea5b041dcf Merge "Allow selecting a different product in banchan." am: 215596dd59 am: 818ba93565 am: a8d93205d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830

Change-Id: Id067069cdcf92602eb2118359336dd560eb55368
2021-04-20 12:33:41 +00:00
Treehugger Robot
f3162034ef Merge "Test changes for build support for test jni_libs" 2021-04-20 12:26:30 +00:00
Martin Stjernholm
a8d93205d3 Merge "Allow selecting a different product in banchan." am: 215596dd59 am: 818ba93565
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830

Change-Id: Ic954dfc3a9ece012439e50b7de8bb972b5cfe80b
2021-04-20 12:00:58 +00:00
Martin Stjernholm
818ba93565 Merge "Allow selecting a different product in banchan." am: 215596dd59
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830

Change-Id: I1e7c7b6449e3b367394b3c6c09997251c3a1bf24
2021-04-20 11:36:24 +00:00
Martin Stjernholm
215596dd59 Merge "Allow selecting a different product in banchan." 2021-04-20 11:22:00 +00:00
Treehugger Robot
e52d2e5dbd Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0 am: 16a42ccf08
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I7df1d7b81485aea822a8fdb5bc7adb78bb73ccc9
2021-04-20 07:29:53 +00:00
Treehugger Robot
16a42ccf08 Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I3480132f93acdc8ed2997c23fbf089c65a13d8dd
2021-04-20 06:57:04 +00:00
Treehugger Robot
a74fbc00a0 Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: Ia56f89b173d19c7797f8b3b94a24da76e5eaff0f
2021-04-20 06:32:21 +00:00
Treehugger Robot
228ef5f05f Merge "Rename ro.product.enforce_debugfs_restrictions" 2021-04-20 06:07:53 +00:00
Treehugger Robot
279ff055a7 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07 am: 0a0ebf40a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I89dd7773cf3af6ac8e8338454d55253192783e27
2021-04-20 04:00:09 +00:00
Daniel Cardenas
68984aa93a Test changes for build support for test jni_libs
Tested with patches:  aosp/1560314  aosp/1560314/

Bug: 176593487
Test: make tvts aapt
Change-Id: I2a2867726cc39758dfb27a0a12867e20e4af56d7
2021-04-19 20:48:02 -07:00
Treehugger Robot
0a0ebf40a9 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I966d1ace2845b1a4cdb94d9aa4f1d4bc70b8b7ac
2021-04-20 03:18:50 +00:00
Treehugger Robot
759af2af07 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: Ie3d20ba6ed9ce95933c3c10257f38e2c4f03572d
2021-04-20 02:52:53 +00:00