Commit Graph

29493 Commits

Author SHA1 Message Date
Kelvin Zhang
c06f0627c3 Embed zucchini version info in target_files
external/zucchini/version_info.h contains version info for zucchini
diffing algorithm. OTA tools will use these version info to check for
compatibility and determine if zucchini can be used safely. Owners of
zucchini agreed to keep the format of version_info.h stable so it's
parser friendly.

Bug: 194237829
Test: m dist
Change-Id: If8e37533933b346d3f03adab9263679910ab328c
2021-11-30 12:38:39 -08:00
Colin Cross
6013329bff Merge "Make SOONG_HOST_OUT an alias for HOST_OUT" 2021-11-30 20:31:26 +00:00
Cole Faust
52e5d9c776 Define $(PRODUCT_OUT) before running the board config
Certain board configurations reference $(PRODUCT_OUT)
through deferred expansion, which will no longer work
after conversion to starlark.

Bug: 201700692
Test: build/bazel/ci/rbc_regression_test.sh -b yukawa-userdebug
Change-Id: I02055f5c4a05e540c1752d5964d4db4306292c3b
2021-11-30 11:24:33 -08:00
Bassem Khalife
6e4c4dadb1 [DO NOT MERGE] Update Security String to 2022-01-01
Bug: 207022948

Change-Id: Id0cffb66a65c60b011d0975ba6b0ff04366472d2
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
Merged-In: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b
2021-11-30 18:17:39 +00:00
Jiakai Zhang
44ffb21e53 Add a variable to specify standalone system server jars.
This is the list of jars that system_server loads dynamically using
separate classloaders. We will rely on this variable to decide which
jars to preopt in the build system and on the device for system_server.

The list is supposed to be in sync with the code in SystemServer.java.
There will be a follow-up CL to add a comment in SystemServer.java to
remind developers to keep them in sync.

Bug: 203198541
Test: m nothing
Change-Id: I305a73218ef2d2c61ac3795d21026b2afe7007fd
2021-11-30 11:07:37 +00:00
Inseob Kim
e124e3a02d Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 206330997
Test: m selinux_policy
Change-Id: Ibbe71843a0ba5677203eabb27690562d55cb057e
2021-11-30 13:44:52 +09:00
Bassem Khalife
000ad3cf5a Update Security String to 2022-01-05
Bug: 207022948

Change-Id: I972415a976bee96d1f93fb547bb5ae5323807516
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-30 00:19:17 +00:00
Martin Stjernholm
bef0d6d710 Use prebuilts of the ART Module by default in SC branches.
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

Cherry-picked from http://ag/15234812.

Merged-in set to https://r.android.com/1801147 to avoid merging into
master and *-plus-aosp branches, where we want to enable prebuilts
separately.

Test: build & boot on Cuttlefish
Bug: 200554575
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
2021-11-29 18:08:52 +00:00
Ulyana Trafimovich
c44c174958 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695 am: ca6e563ad0
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Ie91742d07109af4d1e91eb1ac824a658747dd2c0
2021-11-29 12:28:42 +00:00
Ulyana Trafimovich
ca6e563ad0 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Id22b9a6a233c2a87b7e9e219f4205bb0871a7a1e
2021-11-29 12:17:18 +00:00
Ulyana Trafimovich
b128e28695 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: I82cebfc087ff033f7852c0550fb4568640493021
2021-11-29 12:04:30 +00:00
Ulyana Trafimovich
af78df0553 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." 2021-11-29 11:46:54 +00:00
Inseob Kim
a6568e00e2 Remove 26.0 and 27.0 compat support
Treble doesn't support T system + O vendor, so removing 26.0 (N) and
27.0 (O) prebuilts and compat files.

Bug: 207815515
Test: build
Change-Id: Ie12737cc5ca8725caf834d9bf1bdfe840ac516c0
2021-11-29 01:29:28 +00:00
Ulya Trafimovich
c9ec59c72a Sort PRODUCT_APEX_BOOT_JARS automatically.
This is a follow-up CL for https://r.android.com/1900565.

This is needed because product makefiles may need to add their own
APEX boot jars, and they cannot insert them in the correct alphabetical
order on the list. So it needs to be sorted automatically. Do this
after processing all product makefiles and populating the variable,
but before passing it to Soong.

Bug: 207474880
Test: lunch aosp_cf_x86_64_phone-userdebug && launch_cvd
      # cuttlefish device boots successfully
Change-Id: I86b58ef8aeac595e401d872f59a2936a67bedeec
2021-11-26 16:02:54 +00:00
Cole Faust
7dc5f5812b Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390 am: 638472caa8 am: d3522e842e
Original change: https://android-review.googlesource.com/c/platform/build/+/1900878

Change-Id: I8a543d29937059c5d95eb35542b929417d7aa3cb
2021-11-25 02:00:25 +00:00
Cole Faust
d3522e842e Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390 am: 638472caa8
Original change: https://android-review.googlesource.com/c/platform/build/+/1900878

Change-Id: Ic9ca6e05baa054cf124a7f95628b22d69436f513
2021-11-25 01:42:52 +00:00
Cole Faust
638472caa8 Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390
Original change: https://android-review.googlesource.com/c/platform/build/+/1900878

Change-Id: Ib21e3dc644b5930403dd42c7a47a01b916cb918b
2021-11-25 01:27:02 +00:00
Cole Faust
7d9103b390 Merge "Change type of TARGET_BUILD_APPS from bool to list" 2021-11-25 01:06:53 +00:00
Bassem Khalife
36133c9d03 Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f am: 2c29217e87
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: Ibad40c3f0dff954b6eeb8057c47a89ad45ab48ca
2021-11-25 00:29:30 +00:00
Bassem Khalife
2c29217e87 Update Security String to 2022-01-01 am: af5392280c am: c3a1392249 am: 96d63bce8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I8ff4619dfd22ff1a5fea16aa09d47c79bf271c7e
2021-11-25 00:17:18 +00:00
Bassem Khalife
96d63bce8f Update Security String to 2022-01-01 am: af5392280c am: c3a1392249
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I00cf460d1512ce9ef92f029dd7ef31771358425f
2021-11-25 00:01:53 +00:00
Bassem Khalife
c3a1392249 Update Security String to 2022-01-01 am: af5392280c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16331856

Change-Id: I8073ba94d72c2ccc8ff471dfef76ea98e49dc6d8
2021-11-24 23:49:24 +00:00
TreeHugger Robot
6cf39dbb91 Merge "Update Security String to 2022-01-05 Bug: 207022948" into sc-v2-dev 2021-11-24 23:28:38 +00:00
Android Build Coastguard Worker
8e08f1dfcd Make change and version bump to SQ1A.220105.001
Change-Id: I60f2a06050b58b92104e01f7162beb4adcfb9e0b
2021-11-24 23:26:38 +00:00
Paul Scovanner
e04aaf2f4c [DO NOT MERGE]
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
(cherry picked from commit 9e20227ea5)
Merged-In:Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 23:20:37 +00:00
Treehugger Robot
f8f55143b5 Merge "Exclude predefined variables from board config" am: 359665674f am: 2694a33cb6 am: ce3b3de281
Original change: https://android-review.googlesource.com/c/platform/build/+/1900875

Change-Id: I74d651c57b5dad1fab2e340f8ffa976ea9061878
2021-11-24 21:27:54 +00:00
Treehugger Robot
ce3b3de281 Merge "Exclude predefined variables from board config" am: 359665674f am: 2694a33cb6
Original change: https://android-review.googlesource.com/c/platform/build/+/1900875

Change-Id: I36ec5d6af7442059c6f88713c34efab07b030dfc
2021-11-24 21:08:34 +00:00
Treehugger Robot
2694a33cb6 Merge "Exclude predefined variables from board config" am: 359665674f
Original change: https://android-review.googlesource.com/c/platform/build/+/1900875

Change-Id: If9850339861ea48042a2c397294303430efac819
2021-11-24 20:48:28 +00:00
Treehugger Robot
359665674f Merge "Exclude predefined variables from board config" 2021-11-24 20:30:00 +00:00
Treehugger Robot
5186413206 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a am: 0d780c6218
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I267b439637979847adc595f9a5da1df4fe8222e7
2021-11-24 20:22:16 +00:00
Treehugger Robot
0d780c6218 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I9ad6fe383299e876ac1ec2a6fe29cc17ed45662c
2021-11-24 20:02:59 +00:00
TreeHugger Robot
af8e9715a1 Merge "[DO NOT MERGE] am: 9e20227ea5" into sc-qpr1-dev-plus-aosp 2021-11-24 20:02:36 +00:00
Treehugger Robot
3f8601901a Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I0ec4ccb90656eb52aca495a4da7ba64c033418df
2021-11-24 19:34:15 +00:00
Paul Scovanner
44591c2a8a [DO NOT MERGE] am: 9e20227ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16299320

Change-Id: Ia0ef9b884afe4de7b347a098816409f984173c56
2021-11-24 18:32:21 +00:00
Ulya Trafimovich
00496c1683 Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically.
This is needed because product makefiles may need to add their own
system server jars to this variable, and they cannot insert them in
the correct alphabetical order on the list. So it needs to be sorted
automatically. Do this after processing all product makefiles and
populating the variable, but before passing it to Soong.

Bug: 207474880
Test: atest art_standalone_dexpreopt_tests:art_standalone_dexpreopt_tests.DexpreoptTest#ForSystemServer
Change-Id: I80dbf555c395c92539c506d3d8b1f2f101a58bce
2021-11-24 15:41:49 +00:00
Yi-Yo Chiang
8d2495319b Refactor build logic of boot-debug & vendor_boot-debug
Add PRODUCT variables
  PRODUCT_BUILD_DEBUG_BOOT_IMAGE
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE
as toggles to enable/disable building boot-debug & vendor_boot-debug.

Bug: 200945738
Test: m bootimage_debug
Change-Id: Ic032b8594f776f911d7b6345a97d64fed930d890
Merged-In: Ic032b8594f776f911d7b6345a97d64fed930d890
(cherry picked from commit 4d7c613c58)
2021-11-24 07:53:32 +00:00
Bowgo Tsai
00fc943377 Skip building boot-(test-harness|debug).img if not needed
boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.

(Cherry-picked with Ic032b8594f776f911d7b6345a97d64fed930d890 to
solve merge conflict.)

Bug: 200945738
Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
Merged-In: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
(cherry picked from commit 4bb4d1fb91)
2021-11-24 07:53:20 +00:00
Yi-Yo Chiang
d395c6ff3f Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
If this option is set, then an additional copy of the debug policy can
be installed to the GSI, and the init-second-stage of GSI could load
debug policy from GSI /system_ext when debug-ramdisk is used.

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
Merged-In: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
(cherry picked from commit 0a468fe904)
2021-11-24 14:34:26 +08:00
Nahian Ashraf
ab77473ace DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 15:16:59 +09:00
Treehugger Robot
9680501cc8 Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" 2021-11-24 05:35:08 +00:00
Nahian Ashraf
f41bff99b3 DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 03:34:07 +00:00
Cole Faust
5588a88969 Change type of TARGET_BUILD_APPS from bool to list
TARGET_BUILD_APPS is supposed to be a list of apps to
build, so having it be a bool was incorrect. Change it
to properly reflect what it is, because the starlark
product configuration relies on soong's interpretation
of variables types.

Bug: 201700692
Test: Presubmits
Change-Id: I00109b57abbcda86077f0465f982f54b4a77a7f0
2021-11-23 19:04:11 -08:00
Jiyong Park
73cd59ea8b Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334 am: c28911dd2a am: faf9b72cd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: I1fefaaae594b60cdc7506a510c87f26b12dac39f
2021-11-24 02:43:33 +00:00
Jiyong Park
faf9b72cd3 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334 am: c28911dd2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: Ibc7bfd843c169db507123069ce7237fcccb747a5
2021-11-24 02:26:16 +00:00
Jiyong Park
c28911dd2a Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: I4c3fdafa50465bd050dbf3ef9e873e0e9fb0ff7c
2021-11-24 02:00:55 +00:00
Jiyong Park
4d7ddff334 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-11-24 01:43:19 +00:00
Cole Faust
be6d5f13b2 Exclude predefined variables from board config
mk2rbc has a few predefined variables that can't be
set in the product/board config makefiles, unless they're
set to their predefined values. Exclude these variables
from the board config input variables so that they don't
conflict.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 mainline_system_x86_64-userdebug (ninja files differ still but this fixes a compilation error)
Change-Id: Idc11b2c5029d28116236b289ad1f09afaaf83cc3
2021-11-23 16:45:29 -08:00
Bassem Khalife
ea4df1b901 Update Security String to 2022-01-05
Bug: 207022948

Change-Id: If34c71239a446a49d4521116a35b28418cfcd350
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 00:23:30 +00:00
Bassem Khalife
af5392280c Update Security String to 2022-01-01
Bug: 207022948

Change-Id: I4fa24056c5f6a4847431fdd28ff614e851746314
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-23 23:25:57 +00:00
Cole Faust
8136244322 Merge "Return product config variables from board_configuration" am: 4228f8f7a3 am: 390d1e0795 am: 4cb47e64a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1900113

Change-Id: I21dd82986f05e7ee6001efd268181850fed52ba3
2021-11-23 21:32:37 +00:00