Commit graph

28814 commits

Author SHA1 Message Date
Colin Cross
345da983ad Merge "Extract primary APK from apk sets in Soong" 2021-11-19 02:18:20 +00:00
Colin Cross
da166c5ad4 Make SOONG_HOST_OUT an alias for HOST_OUT
Soong now installs to the same directory as Make, point SOONG_HOST_OUT
at HOST_OUT.

Bug: 204136549
Test: m checkbuild
Change-Id: I49bfc0466056d270c8023288a6fe778c3445a900
2021-11-18 16:26:58 -08:00
Sasha Smundak
7dc8f486c2 Update conversion results file only when it changed.
Test: treehugger
Change-Id: Ia0d6bf614fa0714a977b2880f7271d54df034366
2021-11-18 15:17:59 -08:00
Treehugger Robot
2d04577ee7 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: I9dbe243c6941b04fe8262e59c072fa6a2839d0e2
2021-11-18 22:23:49 +00:00
Xin Li
0d8b812568 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:28:37 +00:00
Sasha Smundak
c20dd972a9 Runtime reporting of the conversion errors.
Bug: 204062171
Test: rbcrun build/make/tests/conversion_error.rbc (displays a message, stops)
  rbcrun RBC_MK2RBC_CONTINUE=t build/make/tests/conversion_error.rbc  (displays a message and continues)
Change-Id: Idf0fe6bbb08b1eca1f392d81950eed4a214f3289
2021-11-18 11:27:55 -08:00
Sasha Smundak
91fc734100 Runtime support for dist-for-goals.
Convert dist-for-goals.

Bug: 198496782
Test: rbcrun build/make/tests/run.rbc
Change-Id: I46ef9e897143aecf8bd28ad8569d48e74530b0e5
2021-11-18 11:20:34 -08:00
Yifan Hong
c59eeaa272 Add recovery service_contexts. am: 276b8c0230
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: Ic397dc0036431b9bdb90ffbd2ba80f32288e1a6c
2021-11-18 05:01:37 +00:00
Yifan Hong
351cd2e489 Merge changes from topic "servicemanager-recovery"
* changes:
  Add servicemanager.recovery to base_vendor.mk.
  Add recovery service_contexts.
2021-11-18 04:39:14 +00:00
Colin Cross
f42c7d6be1 Extract primary APK from apk sets in Soong
In preparation for Soong handling the installation rules, extract
the primary APK from the apk set in Soong.

Bug: 204136549
Test: build test android_app_set
Change-Id: I416b57009101ca4c05c11102f260e102af13bf0d
2021-11-17 19:45:49 -08:00
Treehugger Robot
dacbe7a5a2 Merge "Add notdir implementation" 2021-11-17 20:58:24 +00:00
Cole Faust
0cc94d3275 Add notdir implementation
mk2rbc would already translate notdir calls,
but since there was no implementation it would
fail at runtime.

Bug: 201700692
Test: m rbcrun; rbcrun build/make/tests/run.rbc
Change-Id: Ie0f4e7b65448e612fa56f87b0bc138648cc0ad58
2021-11-17 10:50:14 -08:00
Android Build Coastguard Worker
8dc106e599 Version bump to SQ1A.211205.010 [core/build_id.mk]
Change-Id: I5a87dd2cefcfd7d6b46f5b1c536ab06b53a454c8
2021-11-17 18:23:35 +00:00
Cole Faust
8a7e9afc54 Merge "Don't assume _soong_config_namespaces_key is present" 2021-11-16 19:45:20 +00:00
Android Build Coastguard Worker
314b562dc0 Version bump to SQ1A.211205.009 [core/build_id.mk]
Change-Id: I526237e29ba83c5f2dc366912d2ee6ce51235d9a
2021-11-16 08:28:12 +00:00
Cole Faust
2f4692bf31 Don't assume _soong_config_namespaces_key is present
The board configuration doesn't use init_globals(),
which is where _soong_config_namespaces_key normally
is set. Just assume empty dictionaries in
soong_config_namespace where appropriate.

Bug: 201700692
Test: build/bazel/ci/rbc_product_config.sh -b armv8-userdebug
Change-Id: I5f1e52fa0bdde32bff0e8db54861557dcb327190
2021-11-15 16:03:51 -08:00
Colin Cross
d1c2c4e1b8 Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" 2021-11-15 23:57:57 +00:00
Xin Li
b461e822a1 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235
Change-Id: I5e0d686c2a1cc15e6a3115243f3a83cb070b111c
2021-11-15 23:30:54 +00:00
Treehugger Robot
f1e1bcb0ee Merge "Always default to 1.9 for host java modules in Android.mk files" 2021-11-15 22:36:51 +00:00
Colin Cross
362f55af96 Always default to 1.9 for host java modules in Android.mk files
Host modules shouldn't use the logic for device modules to determine
the java language version to use, always default to 1.9.

Bug: 202761304
Test: m checkbuild
Change-Id: I268dd34d887db4646e188858c7f2aedc30966856
2021-11-15 21:46:52 +00:00
Colin Cross
802f2116ed Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE
Soong creates install rules and lists them in LOCAL_SOONG_INSTALL_PAIRS,
where they get copied to ALL_MODULE.$(m).BUILT_INSTALLED.  BUILT_INSTALLED
is used by package-modules.mk to copy the built modules to alternate
install locations for building zips like continuous_native_tests.zip.

Translate Soong's built module location, which is listed in
LOCAL_PREBUILT_MODULE_FILE, into $(LOCAL_BUILT_MODULE) when setting
BUILT_INSTALLED so that package-modules.mk copies from
$(LOCAL_BUILT_MODULE) instead of $(LOCAL_PREBUILT_MODULE_FILE).  This
ensures that the transitive dependencies added to $(LOCAL_BUILT_MODULE),
for example the unstripped symbols files, are present when
continuous_native_tests.zip is built.

Bug: 206137439
Test: manual
Change-Id: I1a45cd6d3c81d6435a10f4d29557e521753068a4
2021-11-15 13:15:22 -08:00
Inseob Kim
c1d4512e02 Add missing apksigner dependency
Test: build after removing apksigner
Change-Id: I1ed7f13395bf7d5fe5f06a6bc3280809b5038636
2021-11-15 11:26:57 +09:00
Yifan Hong
276b8c0230 Add recovery service_contexts.
This allows servicemanager to run in recovery.

Test: manual
Bug: 170338625
Change-Id: I60671af0bcaf13fd545b2f286243fee474caace5
2021-11-13 00:28:05 -08:00
Ivan Lozano
d96be59972 Merge soong_{cc,rust}_prebuilt.mk
Much of soong_cc_prebuilt.mk is duplicated in soong_rust_prebuilt.mk.
This adds maintenance burden and increases the risk of bugs or
inconsistencies. Merge the two to simplify this.

Bug: N/A, clean-up
Test: m
Change-Id: I833fba94e299006b34f8e53d5519c6b19f684d39
2021-11-12 13:20:08 -05:00
Inseob Kim
f69346e0a8 Add fsverity digest manifest
fsverity digest manifest stores a map from files to fsverity digests.
The manifest is installed as a serialized protobuf file, to a signed apk
system/etc/security/fsverity/BuildManifest.apk.

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: I55fc10400206b8ce0d5f198faea08fe3930b362c
2021-11-11 11:19:44 +00:00
Inseob Kim
9cda397948 Implement fsverity metadata generator
Using fsverity tool, fsverity metadata for specific artifacts in system
mage can be generated. Users can do that by setting a makefile variable
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to true.

If set to true, the following artifacts will be signed.

- system/framework/*.jar
- system/framework/oat/<arch>/*.{oat,vdex,art}
- system/etc/boot-image.prof
- system/etc/dirty-image-objects

One fsverity metadata container file per one input file will be
generated in system.img, with a suffix ".fsv_meta". e.g. a container
file for "system/framework/foo.jar" will be
"system/framework/foo.jar.fsv_meta".

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: Ib70d591a72d23286b5debcb05fbad799dfd79b94
2021-11-11 17:30:19 +09:00
Treehugger Robot
372d74a8c9 Merge "Record ALL_DEPS by default." 2021-11-11 04:48:16 +00:00
Eric Miao
6f2d435d8d Merge "Add oatdump and dexdump to dexpreopt_tools.zip" 2021-11-11 04:30:27 +00:00
Jim Tang
5c6410edee Record ALL_DEPS by default.
Abandon the use of RECORD_ALL_DEPS to record ALL_DEPS.

BUG: 204397180

Test: m, and inspect module-info.json.
Change-Id: Iaf35580b52c11ad37017b1fb8e0937b859d3f55b
2021-11-11 10:24:51 +08:00
Treehugger Robot
7bd2d13cde Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" 2021-11-10 23:38:28 +00:00
Cole Faust
e856367da1 Merge "Add soong_config_get" 2021-11-10 19:46:48 +00:00
Treehugger Robot
585ec03c47 Merge changes from topic "soong-java-install"
* changes:
  Move java install rules into Soong
  Don't create compatibility suite copy rules for installed path
2021-11-10 17:05:51 +00:00
Anton Hansson
0e21221d30 Merge "Fix product single value variables failed issue" 2021-11-10 16:45:36 +00:00
Cole Faust
70a886c7ce Add soong_config_get
Having a function to get soong config variables
makes it easier to convert to starlark.

Bug: 201700692
Test: m RBC_PRODUCT_CONFIG=1 RBC_BOARD_CONFIG=1 nothing and check output files
Change-Id: I8627555df10d3f66f6154c00be9f0565076f1f94
2021-11-09 17:09:04 -08:00
Justin Yun
e81ec6960a Fix BOARD_SYSTEMSDK_VERSIONS checks
BOARD_SYSTEMSDK_VERSIONS must be greater than or equal to the minimum
of PRODUCT_SHIPPING_API_LEVEL and BOARD_API_LEVEL. If BOARD_API_LEVEL
is not defined, read BOARD_SHIPPING_API_LEVEL. If both board api
levels are not defined, compare only with PRODUCT_SHIPPING_API_LEVEL.

Bug: 204964200
Bug: 201489975
Bug: 202919753
Test: manual test with different settings
Change-Id: I36fa0b2fed3bca9ebe1baad46ee1dbe8cb1414e3
2021-11-10 00:34:17 +00:00
Eric Miao
1d0fd2cb91 Add oatdump and dexdump to dexpreopt_tools.zip
Change-Id: If7615e1da24bcb819f595adb88060b164499a598
2021-11-09 18:53:39 +00:00
liulvping
689c3fb5d7 Fix product single value variables failed issue
Test: source & lunch & make

Signed-off-by: liulvping <liulvping@xiaomi.com>
Change-Id: Idd0e1c561504afb7c7fef4242b3b122cba220ed0
2021-11-09 02:05:25 +00:00
Colin Cross
47cfffea79 Move java install rules into Soong
Remove the copy rules for LOCAL_SOONG_BUILT_INSTALLED, they will already
be created by Soong.

Also clean the soong host tools directory to remove any old copies of
java binaries.

Bug: 204136549
Test: m checkbuild
Change-Id: Ib6b5362ad59aa48770e48541430d6857846926c2
2021-11-08 15:23:32 -08:00
Colin Cross
a69b809425 Don't create compatibility suite copy rules for installed path
Don't create compatibility suite copy rules for $(LOCAL_BUILT_MODULE)
to $(LOCAL_INSTALLED_MODULE), as that could conflict with a Soong
install rule.  Instead, always create the install rule the normal way,
and replace the compatibility suite copy rule with a noop if it is the
same as the normal rule.

Bug: 204136549
Test: m checkbuild
Change-Id: Ic8ac80eda8554fae2b7ecc2516165da020bdaebe
2021-11-08 15:23:32 -08:00
Colin Cross
d954ea888a Add missing dependency from module name to symlinks
The rules to install the symlinks had dependencies from PRODUCT_PACKAGES
install rules, but from manual install requests like `m toybox`.  Add
the missing dependencies.  Also add the new declare-0p-target licensing
call.

Fixes: 205524422
Test: m toybox
Change-Id: Ie9a5e37b09250aa271ab153a13f41bc34fa4a38a
2021-11-08 19:40:22 +00:00
Anton Hansson
db7732900b Merge "Do not disable prebuilts for sdk builds" 2021-11-08 10:27:22 +00:00
Cole Faust
c2becd087a Disallow setting LOCAL_MODULE_STEM for android packages
LOCAL_MODULE_STEM is not used in the packaging code,
except when setting PACKAGES.$(LOCAL_MODULE).STEM.
Having this disconnect between PACKAGES.$(LOCAL_MODULE).STEM
and the actual name of the apk causes an apk signing
step to fail.

Other module types like BUILD_HEADER_LIBRARY explicetly
disallow setting LOCAL_MODULE_STEM, so we can also just
do that for packages.

Fixes: 204027319
Test: Presubmits
Change-Id: Ib3da9a8dd6792a6c9d725cb24b835b32dbb13c40
2021-11-05 12:35:18 -07:00
Cole Faust
2f1bd70c9c Merge "Make starlark board configuration work with sdk_phone_x86_64" 2021-11-05 18:42:12 +00:00
Android Build Coastguard Worker
32ce1a4113 Version bump to SQ1A.211205.008 [core/build_id.mk]
Change-Id: I701608290fb184cabcc82c26a7fe841f514d5b4b
2021-11-05 17:31:39 +00:00
Colin Cross
11b78c16ad Merge "Move tools compiled by Soong to HOST_OUT_EXECUTABLES" 2021-11-05 17:14:59 +00:00
Anton Hansson
30ae089556 Do not disable prebuilts for sdk builds
The artifacts in the SDK zip should be OK to build with a prebuilt
stubs enabled, even if prebuilt apexes are not, because the system
images in the SDK stub are not currently used.

Bug: 205008975
Bug: 204407658
Test: m sdk
Change-Id: Ia78cf87743ff394dcfaa1b43556b230c0dda8742
2021-11-05 16:34:27 +00:00
Cole Faust
985fa48a98 Make starlark board configuration work with sdk_phone_x86_64
The main issue with board configuration up till this
cl was that it didn't have access to the product configuration
variables. Pass those in by dumping the make variables to a
temporary file, which is then converted to RBC, loaded,
and passed to the starlark board config..

Bug: 201700692
Test: build/bazel/ci/rbc_product_config.sh -pb sdk_phone_x86_64-userdebug
Change-Id: I9a4946b970ca43c5b5f53a6c507ad2c1a2eca61e
2021-11-04 16:13:24 -07:00
Steven Moreland
ec71cbf0c8 Merge "vintf recovery install parity w/ init_rc" 2021-11-04 22:28:51 +00:00
Treehugger Robot
cd128891ed Merge changes from topic "tproto"
* changes:
  Convert .meta_lic files to textproto
  Add macros for non-module license metadata and deps
2021-11-03 18:31:02 +00:00
Colin Cross
1ee26cae73 Convert .meta_lic files to textproto
Make it easier to write tools against .meta_lic files and store complex
data by writing them in textproto.

Test: builds
Change-Id: Ibbb6cfbb1bdddd3d938a86d563673a049d826d66
2021-11-03 15:44:00 +00:00
Bill Yi
468572bad8 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46
Merged-In: Ia18162968822dfbee5299c2692aef1e3c75ba843
Change-Id: I2b422d3dffe04be00304663294b48052a9a29aca
2021-11-03 12:17:35 +00:00
Bob Badour
879cfa867d Add macros for non-module license metadata and deps
Gets rid of .meta_module files and instead defers emitting rules until
after all the non-module targets have been processed. Allows direct
dependency on .meta_lic files, which in turn depend on license text
files.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m reportmissinglicenses

Change-Id: I2c467feac6e13a9366ff66f924889f1dbd48c3f1
2021-11-03 00:52:25 +00:00
Android Build Coastguard Worker
365249c0d5 Version bump to SQ1A.211205.007 [core/build_id.mk]
Change-Id: Ib967214e43a8a6a665a77b246760fa7e5e8bf717
2021-11-02 18:19:17 +00:00
Treehugger Robot
dcb0e44c46 Merge "Add share_libs and system_share_libs to module-info" 2021-11-02 01:52:17 +00:00
Steven Moreland
b186183ae2 vintf recovery install parity w/ init_rc
There was a relatively recent change (id
I82d0f40d6d7047e271612204391c5a027f84f52f) which avoided installing
init_rc scripts to system when a module was installed to system. This
same bug also existed in VINTF installs.

Future consideration: macrotize behavior (delaying since there are some
subtle differences in paths/variables and given bazel efforts).

Fixes: 204270700
Test: boot
Test: 'mmma hardware/interfaces/health/aidl/default' installs vintf
fragments to '/system/etc/vintf/manifest' before this change but not
after.

Change-Id: Icf505af74c95386a0ed8cb4468dcf7c1122db847
2021-11-01 17:58:28 -07:00
Colin Cross
bca6483b07 Move tools compiled by Soong to HOST_OUT_EXECUTABLES
Soong now installs native tools to HOST_OUT_EXECUTABLES instead
of SOONG_HOST_OUT_EXECUTABLES.

Also add a cleanspec for SOONG_HOST_OUT to remove old files from
SOONG_HOST_OUT_EXECUTABLES.

Bug: 204136549
Test: m checkbuild
Change-Id: Id18213b9294b6d2cf78f657740c6d5a02733b8ad
2021-11-01 15:03:01 -07:00
Colin Cross
3a79e5b459 Merge "Support generating install rules in Soong" 2021-11-01 21:31:56 +00:00
Ulyana Trafimovich
75342c1932 Merge "Deprecate system server jars defined in Android.mk." 2021-11-01 10:01:10 +00:00
yangbill
5f5e2362fa Add share_libs and system_share_libs to module-info
Bug: 202922558
Bug: 204269866
Test: m out/target/product/vsoc_x86_64/module-info.json

Change-Id: Idb4e66216cac4835968454f83196107f6bec4c1c
2021-11-01 06:38:43 +00:00
Treehugger Robot
76a4c62f56 Merge "Support custom APEX signing tool" 2021-10-29 23:39:26 +00:00
Colin Cross
23ee375a4a Support generating install rules in Soong
Support moving some install rules into Soong by allowing Soong to
provide a Makefile containing install rules, and by skipping parts
of base_rules.mk when Soong already created an install rule.

The install rules are exported as a Makefile instead of directly
in Soong's build.ninja file so that base_rules.mk can add dependencies
from the `required` property that are hard to resolve in Soong.

Bug: 204136549
Test: m checkbuild
Change-Id: Ife2964d76469b385e90c0c5f6adf21bd2b5e8bf6
2021-10-29 15:43:39 -07:00
Android Build Coastguard Worker
6c7714e79b Version bump to SQ1A.211205.006 [core/build_id.mk]
Change-Id: Id45d95f0c7e8619fb2d3cf45b77ff7baa18b1b18
2021-10-29 18:09:38 +00:00
Jiakai Zhang
3f35c93578 Merge "Add a build-time check for dexpreopting system server jars." 2021-10-29 18:00:51 +00:00
Jiakai Zhang
b6931f2f5b Add a build-time check for dexpreopting system server jars.
Bug: 201371822
Test: m nothing
Test: manual -
  1. Add "service-permission" to DEXPREOPT_DISABLED_MODULES (https://cs.android.com/android/platform/superproject/+/master:build/make/core/product_config.mk?q=DEXPREOPT_DISABLED_MODULES)
  2. m nothing
  3. See the error:
    Missing compilation artifacts. Dexpreopting is not working for some system server jars
    Offending entries:
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.odex
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.vdex

Change-Id: If29b1c367e22e302f76bfbae29588e69536414b7
2021-10-29 11:56:49 +00:00
Treehugger Robot
bf406bc182 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" 2021-10-29 10:18:07 +00:00
Cheonho Park
440467376e Use findstring to check MODULE_BUILD_FROM_SOURCE
Android 12 can have _compressed target
(e.g com.google.android.conscrypt_compressed),
changed function from `filter` to `findstring`

Same change applied to com.google.android.art checking

Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`

Test: adding one error code temporally, install prebuilt
  train, and check result with,without this fix

    MODULE_BUILD_FROM_SOURCE := true
  + $(error we are here, true $(PRODUCT_PACKAGES))
  endif

Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
2021-10-27 23:53:29 +00:00
Jooyung Han
8caba5e14e Support custom APEX signing tool
When an APEX specifies its custom signing tool (custom_sign_tool:),
apexkeys.txt contains the info and sign_target_files_apks pass the value
to apex_util.

For now the Virt APEX has its own custom signing tool (sign_virt_apex),
which is added to OTATOOLS.

Bug: 193504286
Test: sign_target_files_apks invokes sign_virt_apex
Change-Id: Iba845723fe3e18f542963324b9c58cd00914c5ba
2021-10-27 16:56:22 +09:00
Ulya Trafimovich
7693ec7e03 Deprecate system server jars defined in Android.mk.
Add PRODUCT_BROKEN_DEPRECATED_MK_SYSTEM_SERVER_JARS variable that is
undefined by default. Setting that variable to true enables support for
system server jars defined in Android.mk. It should be enabled on a
per-product basis in product makefiles.

Bug: 203618671
Test: m nothing
Change-Id: If90d7131d37f308c468e395c236d5aa5ad053bad
2021-10-26 14:47:24 +01:00
Sasha Smundak
3370ad5b70 Add board_platform_in/board_platform_is runtime functions.
Bug: 190051051
Test: treehugger
Change-Id: I27269fc0f0f7063635fbb1b1645919b604afb762
2021-10-25 10:41:56 -07:00
Sasha Smundak
dc154164db Better Soong namespace support in the RBC runtime.
Includes:
* Defining namespace again should have no effect
* Allow appending to a variable defined in a namespace
* Consistent naming
* Print namespace variable assignments even if they are empty

Bug: 200297238
Test: rbcrun make/build/tests/run.rbc
Change-Id: I64aa22c4498ae89e4bc3a077d6206ad37d5c7c38
2021-10-25 10:41:46 -07:00
Sasha Smundak
da2f56ebe4 Provide abspath for backward compatibility.
Bug: 194864642
Test: N/A
Change-Id: Ie30c57d8ea93e4247911b6ebf6fd5a3a469ac5e7
2021-10-25 10:33:16 -07:00
Jiyong Park
1010fff193 Add NEED_AIDL_NDK_PLATFORM_BACKEND
The config variable is used to force the generation of the AIDL
ndk_platform backend which will eventually be removed in favor of the
ndk backend. The switch is needed as an escape hatch for some devices
whose BSP (outsourced and thus hardly modifiable) depends on the
ndk_backend libraries.

Bug: 161456198
Test: m
Merged-In: I62c995642b820419eaeedeee616c47aee1da251d
Change-Id: I62c995642b820419eaeedeee616c47aee1da251d
(cherry picked from commit ee29502db2)
2021-10-25 08:55:23 +09:00
Yi-Yo Chiang
09f68abca7 Merge "Revert "Renames boot-debug-*.img in GSI targets"" 2021-10-21 07:22:03 +00:00
Android Build Coastguard Worker
644d60c175 Version bump to SQ1A.211205.005 [core/build_id.mk]
Change-Id: I78d016414961bb43a909443089282e505a47d332
2021-10-20 21:15:58 +00:00
Android Build Coastguard Worker
53d8aa9e90 Version bump to SP1A.211105.004 [core/build_id.mk]
Change-Id: I5efdc7bbff1a82c3827d35649eab32d288828c06
2021-10-20 20:28:38 +00:00
Treehugger Robot
d3b5946171 Merge changes Ie7063c46,I4ffd21bd
* changes:
  Provide is-vendor-board-qcom macro.
  Better Soong config namespace support makefile macros.
2021-10-20 20:03:52 +00:00
Yi-Yo Chiang
ffb366ee99 Revert "Renames boot-debug-*.img in GSI targets"
This reverts commit a2a5db4466.

Reason for revert: original change was obsoleted by
  I3161e42b00a93177a1a4cb3b22da2218d294b7a7

Bug: 202129499
Test: Presubmit; change should be noop
Change-Id: Ib7be1ed73dbf08758276666f8ce35ed9cbf18a36
2021-10-18 06:33:51 +00:00
Dan Willemsen
349dc07933 Shrink Mac builds
Device builds are no longer supported on Mac, but we do support building
various host tools, including the SDK build-tools and platform-tools
packages. All of these are defined in Soong now, so we stop reading all
the Android.mk files, and defining and depending on the device output
targets.

Bug: 187222815
Test: `m`, `m dist`, etc on Mac
Change-Id: Ibb19756d44f2cbc6948381043115718ffc3f4b7d
2021-10-17 00:28:39 -07:00
Dan Willemsen
53c98f7f6d Remove sdk-linux-x86.atree as well
I missed this one in my last change.

Bug: 187222815
Change-Id: Ibdbde80fe531d53ce9e89136211bdf85932c058c
2021-10-16 16:49:41 -07:00
Treehugger Robot
7deaa8102e Merge "Remove old build-tools/platform-tools SDK implementation" 2021-10-16 20:20:33 +00:00
Treehugger Robot
d8f17b1fc4 Merge "Add pcluster and deduplication support for erofs images." 2021-10-16 01:56:43 +00:00
Sasha Smundak
c0fde810ba Provide is-vendor-board-qcom macro.
`is-vendor-board-qcom` supplants `is-vendor-board-platform` as the latter's
second operand is always `QCOM`. To check that BOARD is a QCOM one, write:

```
ifneq (,$(call is-vendor-board-qcom,BOARD))
```

Using `is-vendor-board-qcom` before its implied operands `TARGET_BOARD_PLATFORM`
and `QCOM_BOARD_PLATFORMS` are set is an error.

Bug: 201477826
Test: treehugger
Change-Id: Ie7063c46b7eda092438a59f3682486dd39af3d0b
2021-10-15 15:39:28 -07:00
Sasha Smundak
c5d5bb424f Better Soong config namespace support makefile macros.
Implement two new macros, `soong_config_set` and `soong_config_append`,
which will eventually replace the existing add_soong_config_xxx. With the
new macros, namespace declaration is implicit, and a value can be appended
to a variable in the namespace.

Bug: 200297238
Test: treehugger

Change-Id: I4ffd21bdb6d93db3b1630703fc5f766649b4152c
2021-10-15 15:39:15 -07:00
Treehugger Robot
093f8dcfc9 Merge "Re-enable disable_sparse properties." 2021-10-15 21:44:14 +00:00
Android Build Coastguard Worker
dfc8069c18 Version bump to SQ1A.211205.004 [core/build_id.mk]
Change-Id: I2203ade09b269484f11ab1cf9d244119a1f3c1f3
2021-10-15 21:33:44 +00:00
Dan Willemsen
39b81cdc7a Remove old build-tools/platform-tools SDK implementation
Since those were the only components of the Windows SDK, this removes a
lot of special casing around that as well.

Bug: 187222815
Change-Id: I2690aadcf78e9ccad43314c8475893e81a2e2735
2021-10-15 14:22:07 -07:00
Pierre-Clément Tosi
88cceca4c5 Merge "Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE" 2021-10-15 06:44:04 +00:00
Pierre-Clément Tosi
85da2d3713 Merge "Add pvmfw.img to IMAGES for BUILT_TARGET_FILES_PKG" 2021-10-14 09:11:33 +00:00
Android Build Coastguard Worker
c3dd531992 Version bump to SQ1A.211205.003 [core/build_id.mk]
Change-Id: I851ca67712f8598d3e8afb01e982067d81f93f2e
2021-10-13 22:14:51 +00:00
Yi-Yo Chiang
5ba458f71d Merge "Cleanup dependencies of debug boot images" 2021-10-13 09:58:23 +00:00
David Anderson
64b351b882 Add pcluster and deduplication support for erofs images.
This adds BOARD_xIMAGE_EROFS_PCLUSTER_SIZE and
BOARD_EROFS_PCLUSTER_SIZE, which set the "pcluster size" of erofs images
for individual images or all erofs images respectively. The pcluster
size affects the maximum size of a physical compressed block.

This also adds BOARD_EROFS_SHARE_DUP_BLOCKS, which turns on chunk
support in EROFS.

Bug: 201685920
Test: manual test
Change-Id: I27ec0899f89890562796dd9fa567fc74182fbefb
2021-10-13 01:03:10 -07:00
Android Build Coastguard Worker
a598487d35 Version bump to SQ1A.211205.002 [core/build_id.mk]
Change-Id: I465535ff80b84b1f997e554eae6978e5c398bd3c
2021-10-12 21:23:24 +00:00
Android Build Coastguard Worker
603ccac2a7 Make change and version bump to SQ1A.211205.001
Change-Id: I79f55e1c1d94120983bc97dd4956c571661de1ea
2021-10-11 23:21:32 +00:00
Paul Scovanner
0551d14073 [DO NOT MERGE]
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
(cherry picked from commit 16eff988ab)
2021-10-11 23:21:01 +00:00
Android Build Coastguard Worker
24b9b61f6d Make change and version bump to SQ1A.211011.001
Change-Id: Ie4ec7eb36960eaa00e7694c74ab9514f9bd7f2d5
2021-10-10 23:19:04 +00:00
Android Build Coastguard Worker
2c754e5748 Make change and version bump to SQ1A.211010.001
Change-Id: I9bf8dc5c1f52ea2f82379137477441bedafd0227
2021-10-09 23:18:09 +00:00
Colin Cross
fd54f03d1b Use the Soong output as the checkbuild target
Save disk space when building checkbuild by avoiding copying the Soong
output file into the Make intermediates directory.

All the same files in out/soong that were created by m checkbuild before
this patch are still created after this patch.  In the internal branch
the total size of the out directory after m checkbuild is reduced from
1320 GB to 965 GB.

Bug: 201816050
Test: m checkbuild
Change-Id: I6370df44f9baab00fcfe30c072600fe58109954d
2021-10-09 13:33:40 -07:00
Android Build Coastguard Worker
7e2067c829 Make change and version bump to SQ1A.211009.001
Change-Id: I099b503c42fda9579b14ed33829d1074827f180c
2021-10-09 03:18:46 +00:00
David Anderson
5f4aa6c057 Re-enable disable_sparse properties.
This accidentally got omitted in the recent refactoring of
generate-image-prop-dictionary.

Bug: N/A
Test: build, system.img is not sparsed
Change-Id: Ie2e095aff08e937111f5c7ffc06e38e87c2d7d43
2021-10-08 17:21:43 -07:00
Android Build Coastguard Worker
b94cf826b8 Make change and version bump to SQ1A.211008.001
Change-Id: I8a6b0873a0ec678cc0c20cb1b44c03ed391a1e65
2021-10-08 01:18:17 +00:00
Pierre-Clément Tosi
d8248af3c8 Add pvmfw.img to IMAGES for BUILT_TARGET_FILES_PKG
Package the image even if it was built (previously, only the pre-built
version was being included).

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: Ifb68ad571be78434f815307a5e4939222a28e7b7
2021-10-07 12:18:17 +02:00
Android Build Coastguard Worker
e8d1f50edc Make change and version bump to SQ1A.211007.001
Change-Id: I802282037408c46b1401006273ab2e91dde19a3b
2021-10-07 01:19:02 +00:00
Yi-Yo Chiang
9942f4e51e Cleanup dependencies of debug boot images
Remove redundant dependencies and adjust build rule, so that
  ramdisk-debug.img is built iff. boot-debug.img is built
same adjustment for vendor_boot-debug.img, boot-test-harness.img,
vendor_boot-test-harness.img.

Also remove "rsync" build rule in test harness ramdisk.

Bug: 201753847
Test: PRODUCT_BUILD_DEBUG_BOOT_IMAGE=true \
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE=false \
  => ramdisk-debug.img is built; vendor_ramdisk-debug.img is not
Test: PRODUCT_BUILD_DEBUG_BOOT_IMAGE=false \
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE=true \
  => ramdisk-debug.img is not built; vendor_ramdisk-debug.img is
Test: PRODUCT_BUILD_DEBUG_BOOT_IMAGE=true \
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE=true \
  => ramdisk-debug.img is built; so do vendor_ramdisk-debug.img
Change-Id: I33f526bd3c50b9c4010f46e490cab778fcb23371
2021-10-06 16:17:50 +08:00
Pierre-Clément Tosi
6308e21f92 Merge changes from topic "default-pvmfw-image" am: b3be181687 am: ab1d0dc36e
Original change: https://android-review.googlesource.com/c/platform/build/+/1832464

Change-Id: I5634bf788741410ed532861af8e82d595b6d4a4d
2021-10-06 07:57:59 +00:00
Pierre-Clément Tosi
ab1d0dc36e Merge changes from topic "default-pvmfw-image" am: b3be181687
Original change: https://android-review.googlesource.com/c/platform/build/+/1832464

Change-Id: I92a002aa926d8d48637e35b26c41ef65026e8eed
2021-10-06 07:43:22 +00:00
Pierre-Clément Tosi
b3be181687 Merge changes from topic "default-pvmfw-image"
* changes:
  Add generic board-agnostic pre-built pvmfw.img
  Add framework for building the pvmfw.img partition
  Stop assuming that pvmfw.img can only be pre-built
2021-10-06 07:25:01 +00:00
Android Build Coastguard Worker
0ef0393679 Make change and version bump to SQ1A.211006.001
Change-Id: I1ade61e7bc3e762ac7f2617cab07f411ef80b5f9
2021-10-06 01:18:53 +00:00
Treehugger Robot
950fef5e34 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f744 am: 72c7768320
Original change: https://android-review.googlesource.com/c/platform/build/+/1843156

Change-Id: I53eaeb87edae934938381b884e2cac4b9c8dcd84
2021-10-05 02:15:02 +00:00
Treehugger Robot
72c7768320 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f744
Original change: https://android-review.googlesource.com/c/platform/build/+/1843156

Change-Id: Ib1b20e7c1da4427c30a98d11a2729724ad176be8
2021-10-05 02:02:22 +00:00
Treehugger Robot
9885f2f744 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" 2021-10-05 01:47:30 +00:00
Cole Faust
f2485e3f36 Merge "Add RBC board configuration" am: 4de9bc79fb am: 64fc316e47
Original change: https://android-review.googlesource.com/c/platform/build/+/1842084

Change-Id: Ibb0cf70393a5dc83685e0e4bfd01533a59c50778
2021-10-05 01:18:57 +00:00
Android Build Coastguard Worker
89e4c93007 Make change and version bump to SQ1A.211005.001
Change-Id: Ieb6dc51157cd460266b2e4d37daff66e98a2aca2
2021-10-05 01:18:25 +00:00
Cole Faust
64fc316e47 Merge "Add RBC board configuration" am: 4de9bc79fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1842084

Change-Id: Ibd9b3fc8f4fe4007747c61aa98c9f737b0964ece
2021-10-05 01:01:45 +00:00
Cole Faust
4de9bc79fb Merge "Add RBC board configuration" 2021-10-05 00:49:48 +00:00
Treehugger Robot
4d15c8b486 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Change-Id: I1ccd60fedef28857ccb4aee70b828942c18d17cf
2021-10-04 21:13:54 +00:00
Treehugger Robot
30e367dbb4 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Change-Id: Ib15076b49fd207382fb18dfe554203ec13b2f126
2021-10-04 20:57:28 +00:00
Treehugger Robot
7fe5450be2 Merge "Allow compatibility suite also build a test list" 2021-10-04 20:43:52 +00:00
Dan Shi
fd4802435c Allow compatibility suite also build a test list
The list of tests will be used to filter tests during test mapping run.

Bug: 201591516
Test: m dist cts vts
Change-Id: I2fd63b93c78af4fa88672aa903c87a4777691806
2021-10-04 11:41:06 -07:00
TreeHugger Robot
6a98b6b571 Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71"" into sc-dev-plus-aosp 2021-10-04 14:13:41 +00:00
Pierre-Clément Tosi
592a3ca91b Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE
Rename the BOARD_PVMFWIMG_PARTITION_SIZE variable to follow the format
used by all other partitions: BOARD_$(name)IMAGE_PARTITION_SIZE. Note
that all boards using that variable should have been updated to also
define the new version, by now.

Define the new variable as board read-only, as done for other
partitions.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I5664c903db6388458e906e996115b695220932ca
2021-10-04 14:20:49 +02:00
Yi-Yo Chiang
597fb757cb Merge changes If929bcf9,I9fb5c7fc am: 747a0c12eb am: f93950ae53
Original change: https://android-review.googlesource.com/c/platform/build/+/1842716

Change-Id: I9ba0dd105c54dc5ec3e3ea449fb8e591a559e5f2
2021-10-04 10:14:12 +00:00
Yi-Yo Chiang
f93950ae53 Merge changes If929bcf9,I9fb5c7fc am: 747a0c12eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1842716

Change-Id: I0f9bc530c3e2e83b14efcad778870bc0d7795888
2021-10-04 10:00:49 +00:00
Pierre-Clément Tosi
3bda0d6992 Add generic board-agnostic pre-built pvmfw.img
Make use of the pvmfw.img-building AOSP framework to provide a common
default image instead of requiring boards to necessarily provide their
own but allow over-writing it through BOARD_PREBUILT_PVMFWIMAGE, if
desired.

Note: The Android Virtualization Framework requires the pvmfw partition.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I5e06f08d6e22178e45254b7ab63acd3855d99a38
2021-10-04 11:56:56 +02:00
Yi-Yo Chiang
747a0c12eb Merge changes If929bcf9,I9fb5c7fc
* changes:
  Dedup build rules of ramdisk-(debug|test-harness).img
  Build vendor_ramdisk[-debug].img if building vendor_boot.img
2021-10-04 09:50:36 +00:00
Pierre-Clément Tosi
fa8193c0e9 Add framework for building the pvmfw.img partition
Adapt the variables necessary for building pvmfw.img by following what
was done for other Android partitions and introducing:

 - PRODUCT_BUILD_PVMFW_IMAGE
 - BUILDING_PVMFW_IMAGE
 - BUILT_PVMFWIMAGE_TARGET

Replace the manual 'cp' by the more common 'copy-one-file'.

Bug: 199831815
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img # with TARGET_PKVM_ENABLED=true
Change-Id: I5e4bbcbdbf4b96281ee54631938f097e9744883c
2021-10-04 11:41:34 +02:00
Pierre-Clément Tosi
88648d33c9 Stop assuming that pvmfw.img can only be pre-built
Introduce the BOARD_USES_PVMFWIMAGE variable, similarly to all other
partitions, and use it where appropriate (in particular, where the
soon-to-be incorrect assumption that pvmfw.img could only be a pre-built
board image was made).

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img # with TARGET_PKVM_ENABLED=true
Change-Id: I8f4faa78c741d29b473303b521834387dbd48cd1
2021-10-04 11:37:19 +02:00
Howard Chen
758fa5d831 Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d801 am: 8a59680b4f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Idbfddae657da2479f8a5ff4dad5e07ce2b4189f2
2021-10-04 07:13:20 +00:00
Howard Chen
8a59680b4f Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d801
Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Ibac747f40c9a961fbe692f511b2edfef11f07247
2021-10-04 06:59:55 +00:00
Howard Chen
c1b9c1d801 Merge "Make GSI target to export bootimage to DIST" 2021-10-04 06:36:32 +00:00
Android Build Coastguard Worker
2c92915ee5 Make change and version bump to SQ1A.211004.001
Change-Id: I126110665511a97b51b2ffe8a2984bec402ff043
2021-10-03 23:18:27 +00:00
Android Build Coastguard Worker
309aded999 Make change and version bump to SQ1A.211003.001
Change-Id: I5de8d3ff750a931f954205bc65b1e597e9b11101
2021-10-02 23:18:16 +00:00
Android Build Coastguard Worker
ff5c9e365b Make change and version bump to SQ1A.211002.001
Change-Id: I097f9ac45546f5fa4db8d6e35eb90eac74ffd3a0
2021-10-02 03:18:40 +00:00
Cole Faust
e5e7a2d531 Add RBC board configuration
This does largely the same thing as in product configuration,
it converts the board makefiles and evaluates them in place
of an $(include).

Bug: 201700692
Test: Temporarily replace the ifndef RBC_BOARD_CONFIG with RBC_PRODUCT_CONFIG,
      then ./build/bazel/ci/rbc_product_config.sh aosp_arm64-userdebug
Change-Id: I91c3dd6b91cf6bfeb18a5fff95d53b7a2c113c57
2021-10-01 17:56:54 -07:00
Android Build Coastguard Worker
6ee7791149 Version bump to SQ1A.211001.002 [core/build_id.mk]
Change-Id: I373e1b38debdf54df1e3d61cfc2d523af1374da5
2021-10-01 20:43:11 +00:00
Martin Stjernholm
42904d1346 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71"
This reverts commit 29502219df.

Reason for revert: Follow AOSP for prebuilts in the -plus-aosp branch, i.e. disable them.

Change-Id: I615c644229fbb55a60633c3cc1aba2497674c0b0
2021-10-01 18:40:25 +00:00
Colin Cross
41171358e9 Merge "Support per-testcase directories in all test suites" am: 894e9be3f7 am: 651b8b7eb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: Ic356a788a99ea3dc59c460c9f82986f940c6301b
2021-10-01 17:03:23 +00:00
Colin Cross
651b8b7eb0 Merge "Support per-testcase directories in all test suites" am: 894e9be3f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: I27999b873212cb1ab52cb75a7dd9a6992d595145
2021-10-01 16:46:26 +00:00
Colin Cross
894e9be3f7 Merge "Support per-testcase directories in all test suites" 2021-10-01 16:27:55 +00:00
Jeongik Cha
fe6ef7c08a BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists
BOARD_SYSTEMSDK_VERSIONS should be checked by BOARD_API_LEVEL,
BOARD_SHIPPING_API_LEVEL, or PRODUCT_SHIPPING_API_LEVEL in a forward
order.

Bug: 201489975
Test: BOARD_SYSTEMSDK_VERSIONS := 30, PRODUCT_SHIPPING_API_LEVEL := 31,
BOARD_API_LEVEL := 30, and then check if there isn't an error

Change-Id: I00e3bf8dda6e6e87a2daf42c74d703503cbeed1f
2021-10-01 23:30:13 +09:00
Yi-Yo Chiang
6c51a43bcc Dedup build rules of ramdisk-(debug|test-harness).img
Adjust code location, factor out common code, eliminate dead code.

Bug: 201753847
Test: Presubmit; change is noop
Change-Id: If929bcf92bc03305058d2d8179c8dba351961c8e
2021-10-01 21:45:44 +08:00
Yi-Yo Chiang
870ea163c2 Build vendor_ramdisk[-debug].img if building vendor_boot.img
Make vendor_boot.img / vendor_ramdisk.img symmetrical to boot.img /
ramdisk.img.

Bug: 201753847
Test: Build and check vendor_ramdisk[-debug].img
Change-Id: I9fb5c7fca09a77446bd140ca549c2091fc9c6a40
2021-10-01 21:45:34 +08:00
Ulyana Trafimovich
166f4ff2ec Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef84f am: e6a4320cb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1841575

Change-Id: I85a852a875351bc9f18f1f3cd09d13e4d485e749
2021-10-01 07:48:41 +00:00
Ulyana Trafimovich
e6a4320cb0 Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef84f
Original change: https://android-review.googlesource.com/c/platform/build/+/1841575

Change-Id: Id9dfc110111e09a3d82d0ae6f76ce943431b8bb6
2021-10-01 07:34:20 +00:00
Ulyana Trafimovich
85ed8ef84f Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." 2021-10-01 07:21:39 +00:00
Yi-Yo Chiang
3e37268a58 Merge "Refactor build logic of boot-debug & vendor_boot-debug" am: 710e74588b am: dd2fe1f51d
Original change: https://android-review.googlesource.com/c/platform/build/+/1839816

Change-Id: I120da50545d7014f074aac68fd0a220bf50bfdf3
2021-10-01 02:03:21 +00:00
Yi-Yo Chiang
dd2fe1f51d Merge "Refactor build logic of boot-debug & vendor_boot-debug" am: 710e74588b
Original change: https://android-review.googlesource.com/c/platform/build/+/1839816

Change-Id: If62de0660fb5f5e5f39ec5ce89384c97e635c9fe
2021-10-01 01:53:00 +00:00
Yi-Yo Chiang
710e74588b Merge "Refactor build logic of boot-debug & vendor_boot-debug" 2021-10-01 01:35:23 +00:00
Android Build Coastguard Worker
55718766e2 Make change and version bump to SQ1A.211001.001
Change-Id: Iba71de387fa1f17ee4867646da03dd1f62c891a1
2021-10-01 01:17:47 +00:00
Anton Hansson
311dfa0ef3 Merge "Update base sdk extension version to 1" into stage-aosp-master am: 200bada63c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15934175

Change-Id: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b
2021-09-30 13:10:37 +00:00
Ulya Trafimovich
ddec79ce54 Remove unused variable SKIP_BOOT_JARS_CHECK.
The variable is no longer used after https://r.android.com/1737753.

Bug: 189298093
Test: m
Change-Id: I6bcb6735189429551ebca697441f2a1edb5c4dfa
2021-09-30 14:00:34 +01:00
Anton Hansson
200bada63c Merge "Update base sdk extension version to 1" into stage-aosp-master 2021-09-30 12:49:03 +00:00
Yi-Yo Chiang
4d7c613c58 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
2021-09-30 18:32:55 +08:00
Howard Chen
95339b0d91 Make GSI target to export bootimage to DIST
This is to support a bootimage only target in AB.

Bug: 198363484
Test: lunch aosp_arm64-userdebug; make bootimage dist

Change-Id: I9a32c365f635ec4693675a1969d7a1e684c8f55a
2021-09-30 07:10:05 +00:00
Android Build Coastguard Worker
5a757bdb23 Make change and version bump to SQ1A.210930.001
Change-Id: I6403f9c95e0782b699ce6d4da5f67346338e395c
2021-09-30 01:19:27 +00:00
Treehugger Robot
63aa5e048e Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c am: b4dcb50d1f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I10c23cfe47d1d4e1a2340c9bf4767b34109e4881
2021-09-30 00:58:16 +00:00
Treehugger Robot
b4dcb50d1f Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I42248bdf71f73686412cb2eb7dcf659ceb61c074
2021-09-30 00:45:11 +00:00
Treehugger Robot
64bc620d8c Merge "Show mk2rbc warnings when they occur" 2021-09-30 00:32:45 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Anton Hansson
c9b330cacc Update base sdk extension version to 1
S ships with extension version 1, so the correct base extension version
is 1 at the moment.

Bug: 199852423
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      verify IsBaseSdk=true
Change-Id: I465d896fdeacfe34bdbfa0da1871d74a3bf3ee11
2021-09-29 17:15:58 +01:00
Treehugger Robot
898e531d0a Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a am: c4b0e4f1cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I47aef52ece71bfe96a7a31fba1f76b060f966094
2021-09-29 16:13:21 +00:00
Treehugger Robot
c4b0e4f1cd Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I732f4aeea701961784ab3897fd1a2eda1440f049
2021-09-29 15:57:03 +00:00
Android Build Coastguard Worker
732bec60f3 Make change and version bump to SQ1A.210929.001
Change-Id: I59b0e2b3412d0212493aeba13ad3fe93b1717b9a
2021-09-29 01:18:16 +00:00
Cole Faust
e96edc34ce Fix parsing issues in board_config.mk
Soong's "androidmk" makefile parser couldn't parse
board_config.mk due to these issues.

Fixes: 201440410
Test: Manually
Change-Id: I2dc298fb969a140e14f704a8c9f9f2ec98be7bc0
2021-09-28 12:43:04 -07:00
Xin Li
68b4fefd60 Merge SP1A.210812.016
Merged-In: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
Change-Id: I4777de3e09216497b88f6916f8a5997e4cd10743
2021-09-28 19:25:30 +00:00
Cole Faust
ee8cd58a85 Show mk2rbc warnings when they occur
There was a missing $ for variable expansion,
and $(info) does not seem to show up in soong output,
but $(warning) does.

Fixes: 201431870
Test: After introducing a problem in mk2rbc: m RBC_PRODUCT_CONFIG=1 nothing
Change-Id: Ife7786d27a7315e873ea125ca361e684ffb79e1e
2021-09-28 11:30:03 -07:00
Android Build Coastguard Worker
127f7ad575 Make change and version bump to SQ1A.210928.001
Change-Id: I808661290805b9e8b28ba11fe455e42f9619b4d8
2021-09-28 01:17:38 +00:00
Treehugger Robot
d47b774373 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd am: 687c66b021
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: I8b912cdc08f8f5dd60493ec27aeedcbdd3761921
2021-09-27 11:36:04 +00:00
Treehugger Robot
687c66b021 Merge "Add more sepolicy variables to soong_config" am: 2c8d7798cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1826139

Change-Id: Ia51d77efa4576f5feadd60f1d927c4990e462985
2021-09-27 11:20:39 +00:00
Treehugger Robot
2c8d7798cd Merge "Add more sepolicy variables to soong_config" 2021-09-27 11:05:19 +00:00
Android Build Coastguard Worker
698c766097 Make change and version bump to SQ1A.210927.001
Change-Id: I1366546b6b6b7fba4b1aa153d5da68ee0e9a23ee
2021-09-26 23:18:07 +00:00
Android Build Coastguard Worker
60ee7b7a76 Make change and version bump to SQ1A.210926.001
Change-Id: I2a54c51e336ae405590fc6f8c82d74ce9ff43a4a
2021-09-25 23:19:27 +00:00
Treehugger Robot
d8c1450d54 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6 am: d995c9e246
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I86df86c895440f1066fe5ab2bb055fd97d3dc85b
2021-09-25 04:04:37 +00:00
Treehugger Robot
d995c9e246 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I77024efd9f0281e40397bdebfab4160997bb50dc
2021-09-25 03:50:32 +00:00
Treehugger Robot
b7aced88d6 Merge "Renames boot-debug-*.img in GSI targets" 2021-09-25 03:33:40 +00:00
Android Build Coastguard Worker
0b2acc9cd4 Make change and version bump to SQ1A.210925.001
Change-Id: I1081057521f05ae6acdf75502217a8c9565b1308
2021-09-25 03:18:05 +00:00
Treehugger Robot
e3eb897949 Merge "Return find_and_copy result in sorted order." am: 128bfc440e am: 73c444b40e
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: Ic40097a497db49cb3566b67bb69b93dc52033fca
2021-09-25 02:54:43 +00:00
Treehugger Robot
73c444b40e Merge "Return find_and_copy result in sorted order." am: 128bfc440e
Original change: https://android-review.googlesource.com/c/platform/build/+/1836494

Change-Id: I44bf1da6108f9a0f4974b73ab252fd1d2e2b23b8
2021-09-25 02:44:50 +00:00
Treehugger Robot
128bfc440e Merge "Return find_and_copy result in sorted order." 2021-09-25 02:27:35 +00:00
Colin Cross
f4017412e2 Support per-testcase directories in all test suites
There are cases where two modules try to install the same test data
into CTS, which results in collisions when CTS puts the data for all
tests in the same directory.  Add a flag that allows enabling a
per-testcase directory for an individual test for all test suites.

Bug: 193168159
Test: cts-tradefed run commandAndExit CtsBionicTestCases
Change-Id: I4bfaaedfe0e6b8df9c75125b3e2762a4f0d5b395
2021-09-24 16:58:03 -07:00
David Anderson
441fd282ca Merge "Allow changing the EROFS compressor." am: 684e74ae15 am: 6d3e5ac6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I6be84d01b565395e1cb37181399ce0c27036bf19
2021-09-24 19:43:34 +00:00
David Anderson
6d3e5ac6e7 Merge "Allow changing the EROFS compressor." am: 684e74ae15
Original change: https://android-review.googlesource.com/c/platform/build/+/1833630

Change-Id: I75fc2f11707825da9acb26138666dc9de77553c2
2021-09-24 19:26:10 +00:00
David Anderson
684e74ae15 Merge "Allow changing the EROFS compressor." 2021-09-24 19:12:53 +00:00
Ivan Lozano
d3ad2b1dad Merge "rust: Add EXTRA_CONFIGS to rust test template" am: bdf229ce99 am: 6af95e337e
Original change: https://android-review.googlesource.com/c/platform/build/+/1832615

Change-Id: I4da271befdb4683d00231e0df4b7ab9465993c32
2021-09-24 19:05:47 +00:00
Ivan Lozano
6af95e337e Merge "rust: Add EXTRA_CONFIGS to rust test template" am: bdf229ce99
Original change: https://android-review.googlesource.com/c/platform/build/+/1832615

Change-Id: I8ca2d4a7f60e8cbfc550f6e037d68df66da1a8aa
2021-09-24 18:54:05 +00:00
Ivan Lozano
bdf229ce99 Merge "rust: Add EXTRA_CONFIGS to rust test template" 2021-09-24 18:39:47 +00:00
Android Build Coastguard Worker
382824ecef Version bump to SQ1A.210924.002 [core/build_id.mk]
Change-Id: Ie3b4f471c6dc0cd72368de894996ebee0aaabb46
2021-09-24 18:20:57 +00:00
Treehugger Robot
54676e9237 Merge "Separate output from diagnostics in Starlark product configuration." am: 335f594e30 am: ee05ac0d49
Original change: https://android-review.googlesource.com/c/platform/build/+/1836493

Change-Id: I38762a26397eabc44cf05218f8f827b1a13fc521
2021-09-24 18:20:36 +00:00
Treehugger Robot
ee05ac0d49 Merge "Separate output from diagnostics in Starlark product configuration." am: 335f594e30
Original change: https://android-review.googlesource.com/c/platform/build/+/1836493

Change-Id: I70ae0619f2f5d6da86a1aa4dc6080643b6d950a8
2021-09-24 18:06:07 +00:00
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Sasha Smundak
3dc68f1750 Return find_and_copy result in sorted order.
To facilitate regression testing.

Fixes: 200679083
Test: manual
Change-Id: I9c5ee84a26cecd1c1d770b773539a77f8115fe48
2021-09-24 08:54:43 -07:00
Sasha Smundak
e8652d4cd1 Separate output from diagnostics in Starlark product configuration.
Some of the product configuration makefiles use `info` and `warning` Make's
builtins for diagnostics. As running Starlark configuration generates the makefile
as its output, this diagnostics has to go elsewhere. Implement `rblf_log` as
the functional equivalent of `print` that writes to stderr instead of stdout
and use it to implement `info` and `warning` counterparts.

Fixes: 201073196
Test: manual
Change-Id: Ib4d9c10566f9b20310fbee41eda67f0a621b0a84
2021-09-24 08:54:29 -07:00
Yi-Yo Chiang
87e59f48fe Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb87 am: 2a4b948f44
Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: Id93b39920defb46551eb6d0798ff7ed96832b859
2021-09-24 03:44:33 +00:00
Yi-Yo Chiang
2a4b948f44 Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb87
Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: I3318b0a47b0c5c1181b3dbdf676bcadf27781e6a
2021-09-24 03:25:31 +00:00
Yi-Yo Chiang
ad48e9cb87 Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2021-09-24 03:10:34 +00:00
Android Build Coastguard Worker
628bbffb96 Make change and version bump to SQ1A.210924.001
Change-Id: I7cb26089c83dc2cf20f63d9f498d258644736ccc
2021-09-24 01:17:47 +00:00
Colin Cross
349164589f Merge "Remove MAINDEXCLASSES" am: e919f2b8b1 am: 59737777dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: Ida92bc8dff888d35d5ff2dec51c7422e02ec6f66
2021-09-23 16:47:23 +00:00
Colin Cross
59737777dd Merge "Remove MAINDEXCLASSES" am: e919f2b8b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1833628

Change-Id: I95d200e87eeb41f6eb686ab9913b748ae340a68d
2021-09-23 16:33:21 +00:00
Colin Cross
e919f2b8b1 Merge "Remove MAINDEXCLASSES" 2021-09-23 16:19:18 +00:00
Yi-Yo Chiang
f63bd5d4ba Reland: 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: I8c62a3cea026bd26b1994092a14238d22ba1e2df
2021-09-23 14:26:04 +00:00
Bowgo Tsai
a2a5db4466 Renames boot-debug-*.img in GSI targets
Those boot-debug-*.img is used with `repack_bootimg` for a
vendor_boot-debug.img in VTS setup. It is not for GKI boot.img
release.

  https://source.android.com/compatibility/vts/vts-on-gsi#repacking

Renames boot-debug-*.img to boot-with-debug-ramdisk-*.img to
avoid confusion with the official GKI boot.img release.

Bug: 200878300
Test: `lunch gsi_arm64-user` then `make bootimage_debug`
Change-Id: Ia1f6ba847d5b7409fb7a8534432484d2aa972494
2021-09-23 22:19:52 +08:00
Santiago Seifert
bd69758dd9 Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" am: 1fcf4894d0 am: be4d8a5e8f
Original change: https://android-review.googlesource.com/c/platform/build/+/1834616

Change-Id: I1db995ec9eee08225f9b11ce1d674d8f1705002d
2021-09-23 13:37:54 +00:00
Santiago Seifert
be4d8a5e8f Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" am: 1fcf4894d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1834616

Change-Id: Ib6b8d6ce6a34a8e26b914344fe2c4b3e711ba177
2021-09-23 13:33:47 +00:00
Ulyana Trafimovich
3bfe100c42 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: adcdb18257 am: cbf1ed03f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1832297

Change-Id: Ie019456e048e1c755d52a527b8f91e0cea39055f
2021-09-23 13:25:59 +00:00
Santiago Seifert
1fcf4894d0 Merge "Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"" 2021-09-23 13:25:55 +00:00
Ulyana Trafimovich
cbf1ed03f0 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: adcdb18257
Original change: https://android-review.googlesource.com/c/platform/build/+/1832297

Change-Id: If5e1a28a37cf666408f8811c1fb8f187fc3f5e23
2021-09-23 13:23:54 +00:00
Ulyana Trafimovich
adcdb18257 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." 2021-09-23 13:20:49 +00:00
Santiago Seifert
08fbdf8c75 Revert "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"
Revert "Add system_ext_userdebug_plat_sepolicy.cil for GSI"

Revert submission 1824717-gsi_debug_policy

Reason for revert: Breaks the build (see b/200933187).
Reverted Changes:
I37ef02628:Add a copy of debug policy to GSI system image
I9c3dad8bb:Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
I43adc6ada:Add system_ext_userdebug_plat_sepolicy.cil for GSI...
I4d6235c73:Add /system_ext/etc/selinux/ to the debug policy s...
Bug: 200933187
Change-Id: I4252793fbee1b83e3db26f944ac0be6581fa773f
2021-09-23 13:13:40 +00:00
Ulya Trafimovich
44f762a766 Move copy rule for system server jars from dexpreopt_gen to makefiles.
This is necessary in order to expose the copy rule to Ninja. Otherwise
Ninja has a build rule that depends on the copied jar (namely, dexpreopt
commands for all subsequent system server jars that have the current one
in class loader context), but no rule that creates it, so Ninja fails
with a "no rule to make ..." error.

The change only affects system server ed in Android.mk

Previously the problem existed, but was hidden by the fact that the only
system server jar defined in Android.mk was the last one on the list, so
no other jar depended on it. Now that updatable apex jars are also
dexpreopted (https://r.android.com/1828115) the problem was uncovered.

Also the patch removes obsolete logic that disable dexpreopt for
PRODUCT_APEX_SYSTEM_SERVER_JARS; these jars are now preopted (but they
are all defined in Android.bp anyway, so no functional change here).

Bug: 200297762
Test: lunch bertha_x86_64-userdebug && m
Change-Id: I67c6d69f45ca3495f62994b5329f9e424dda4e65
2021-09-23 12:10:04 +01:00
Yi-Yo Chiang
05c72306f7 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: 8d0e824a78 am: 3c1e027070
Original change: https://android-review.googlesource.com/c/platform/build/+/1825193

Change-Id: I2c638142eb1a223b12e1825efd133b443ae9f2f2
2021-09-23 10:28:28 +00:00
Yi-Yo Chiang
3c1e027070 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: 8d0e824a78
Original change: https://android-review.googlesource.com/c/platform/build/+/1825193

Change-Id: I0dae07dea19baeba60d49b4ed1816fb8430be597
2021-09-23 10:15:17 +00:00
Yi-Yo Chiang
8d0e824a78 Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2021-09-23 10:07:10 +00:00
Android Build Coastguard Worker
659e044b98 Version bump to SP1A.211105.003 [core/build_id.mk]
Change-Id: If3c90060e117372b9590550813fafb7b1d9dd4b8
2021-09-23 01:29:28 +00:00
Android Build Coastguard Worker
ab41425141 Make change and version bump to SQ1A.210923.001
Change-Id: Ic6d9843f3211fe2a87a2e837107c322e3502dbb0
2021-09-23 01:18:19 +00:00
David Anderson
40a821f600 Allow changing the EROFS compressor.
This adds BOARD_EROFS_COMPRESSOR to change the compression algorithm
globally, and BOARD_{x}IMAGE_EROFS_COMPRESSOR to change it for
individual partitions.

Bug: N/A
Test: manual test
Change-Id: I2ef831558242a4070ee96269140c33b66c689351
2021-09-22 18:04:27 -07:00
David Anderson
87482b46eb Merge "Refactor generate-image-prop-dictionary." am: 4cf8170fed am: c44602819e
Original change: https://android-review.googlesource.com/c/platform/build/+/1832960

Change-Id: I5c6b2e51fdeecd2493e8ad4f3519ca1724ef5b6d
2021-09-23 00:55:28 +00:00
David Anderson
c44602819e Merge "Refactor generate-image-prop-dictionary." am: 4cf8170fed
Original change: https://android-review.googlesource.com/c/platform/build/+/1832960

Change-Id: I002cc8fa262f15cdfb638d4bfd17fd7ff1ae5888
2021-09-23 00:42:32 +00:00
David Anderson
4cf8170fed Merge "Refactor generate-image-prop-dictionary." 2021-09-23 00:31:19 +00:00
Treehugger Robot
34af8ed377 Merge "Add is-board-platform2/is-board-platform-in-list2" am: 562e71bb7e am: 3aac1ab175
Original change: https://android-review.googlesource.com/c/platform/build/+/1810519

Change-Id: Ie90bf95a8ef5608cbd1ffc2f5d63b050d0802276
2021-09-22 23:37:29 +00:00
Treehugger Robot
3aac1ab175 Merge "Add is-board-platform2/is-board-platform-in-list2" am: 562e71bb7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1810519

Change-Id: Ib08d954173122209a680ced3dd1c0841d5b6b7b9
2021-09-22 23:22:32 +00:00
Treehugger Robot
562e71bb7e Merge "Add is-board-platform2/is-board-platform-in-list2" 2021-09-22 23:09:11 +00:00
Colin Cross
5a3729b2ba Remove MAINDEXCLASSES
The last user of MAINDEXCLASSES was removed in
Ia88660550c3e57749b8ccb154e97c31aaf2fcf3a.

Test: m checkbuild
Change-Id: I35d9e7d9ff4ac2c07716db59c900b8c3f2cb352e
2021-09-22 15:53:39 -07:00
David Anderson
707e6f5ac8 Refactor generate-image-prop-dictionary.
It's really error prone to add new partitions or image flags given the
amount of code duplication here. Since most images have (or should have)
roughly the same flags, this factors the work out into a helper
function.

Bug: N/A
Test: m, m otapackage
Change-Id: If1a22b9d7b5cf028ba52608322c4383792dae6b9
2021-09-22 14:14:44 -07:00
Treehugger Robot
2f8577683c Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30e5 am: ae5c1cf357
Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I6bee884b3fcd0efdde9d1c0953117e029fa3a4df
2021-09-22 07:01:11 +00:00
Treehugger Robot
ae5c1cf357 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" am: 9d57bf30e5
Original change: https://android-review.googlesource.com/c/platform/build/+/1832959

Change-Id: I8d2436e24abdff9dbbeb23db34a420246c69f3b1
2021-09-22 06:45:42 +00:00
Treehugger Robot
9d57bf30e5 Merge "Revert "update build rules to use /data/local/tests/unrestricted"" 2021-09-22 06:33:44 +00:00
Guang Zhu
97278c1828 Revert "update build rules to use /data/local/tests/unrestricted"
Revert "update build rules to use /data/local/tests/unrestricted"

Revert submission 1826231-native-test-path

Bug: 199996863

Reason for revert: b/199996863
Reverted Changes:
Ic106011a7:update build rules to use /data/local/tests/unrest...
Id727355ec:update build rules to use /data/local/tests/unrest...

Change-Id: I18301ab3effacd43ff2f136bba9d3244b497a54b
2021-09-22 04:20:05 +00:00
Android Build Coastguard Worker
9469c6597a Make change and version bump to SQ1A.210922.001
Change-Id: I24d83f9d95300e8f93209ba6cc5bf601d6ce32ab
2021-09-22 01:17:53 +00:00
Ivan Lozano
b74088f8b0 rust: Add EXTRA_CONFIGS to rust test template
Bug: 200602232
Test: Extra configs are in generated config
Change-Id: I4abd822f970747a176a746c00d0fa5246441f331
2021-09-21 12:31:22 -04:00
Android Build Coastguard Worker
b66e762e34 Make change and version bump to SQ1A.210921.001
Change-Id: Id764355f4077c2f1da44939cde55cb0050741700
2021-09-21 01:18:03 +00:00
Alexander Smundak
ffaa210dca Merge "Make global config depend on version defaults." am: b9306ac477 am: 64f39fec22
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533

Change-Id: I19899584b5da0acafe9b1cb23157ba5a94b9b5a7
2021-09-20 17:31:20 +00:00
Alexander Smundak
64f39fec22 Merge "Make global config depend on version defaults." am: b9306ac477
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533

Change-Id: I6ec80bf9f029eb7f5dca2d25118d030cad386c3b
2021-09-20 17:13:56 +00:00
Sasha Smundak
3a1764f8be Add is-board-platform2/is-board-platform-in-list2
This is the first step to get rid of the set of identical macros defined
in utils.mk files in multiple device/google/xxxx directories. The macros
is-board-platform/is-board-platform-in-list will be eventuall replaced
with the new ones.

Bug: 190051051
Test: treehugger
Change-Id: I28017df86dbd899be38f882dd5496c894986d8db
2021-09-20 09:57:36 -07:00
Alexander Smundak
b9306ac477 Merge "Make global config depend on version defaults." 2021-09-20 16:56:10 +00:00
Android Build Coastguard Worker
dc0e6c8dfa Make change and version bump to SQ1A.210920.001
Change-Id: Iedd773c7fc199c173295a344b15fe0b2b5006817
2021-09-19 23:17:50 +00:00
Android Build Coastguard Worker
4512965dec Make change and version bump to SQ1A.210919.001
Change-Id: I45d8a8db7e4dd0932061a42b6d82a7928aa36685
2021-09-18 23:17:49 +00:00
Android Build Coastguard Worker
0c67a8c42b Make change and version bump to SQ1A.210918.001
Change-Id: I15bcc79060d64da7c9e361dbc2633fde2628c8bb
2021-09-18 03:17:58 +00:00
Yuntao Xu
eb83f1f0d6 Merge "move cts-test-coverage" am: 68be5b858c am: 272c630c5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792

Change-Id: I0ab460568ac52dde7400f71d791fbec7afba71ea
2021-09-17 23:41:57 +00:00
Yuntao Xu
272c630c5f Merge "move cts-test-coverage" am: 68be5b858c
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792

Change-Id: I99cf14fe6e7795ab5afbe6c29ce55e608352c64a
2021-09-17 23:27:11 +00:00
Yuntao Xu
68be5b858c Merge "move cts-test-coverage" 2021-09-17 23:13:58 +00:00
Android Build Coastguard Worker
c3fa5c5a55 Version bump to SP1A.211105.002 [core/build_id.mk]
Change-Id: Id38a1a391cbdfc858e9ef08a08f5230bad5777e4
2021-09-17 19:22:08 +00:00
Sasha Smundak
b2220c2990 Make global config depend on version defaults.
Starlark-based product configuration can now share version settings
with makefile product config (mk2rbc converts version_defaults.mk into
version_defaults.rbc which is consumed by runtime initialization).

Bug: 198995713
Test: rbcrun build/make/tests/run.rbc
Change-Id: I1d3ddfed3b15d346b3e10714a195a9f0a3a55a56
2021-09-17 11:00:29 -07:00
Yi-Yo Chiang
0a468fe904 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
2021-09-17 20:53:56 +08:00
Treehugger Robot
b939ae8c2a Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814 am: d656f50618
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I5eed84b57b03d81777e52ed116118820718b7383
2021-09-17 06:29:30 +00:00
Treehugger Robot
d656f50618 Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032

Change-Id: I2bda18219770a634add3716a3de215b8fc41cba6
2021-09-17 06:08:53 +00:00
Android Build Coastguard Worker
d04ba4f636 Make change and version bump to SQ1A.210917.001
Change-Id: Iabf43975becd2590a41420f20e4def845d4a251c
2021-09-17 01:23:42 +00:00
Dan Willemsen
616e7fd9b6 Stop disting monolithic SDK for Mac SDK builds
The Mac SDK build is being reduced to just the build-tools and
platform-tools packages. I'm still working on refactoring those builds
not to require the monolithic SDK to be built first, but we can at least
stop distributing it (and other related files) now.

Most of these checks can likely go away once the build refactor is
complete, since we'll be able to move away from the `sdk` target to
something more specific. Right now there's a lot of logic around sdk
being in MAKECMDGOALS that I don't want to unravel with the current
build logic.

Bug: 187222815
Change-Id: I1f711ce063170e41078ad4a125bcd77340a1746c
2021-09-16 14:54:38 -07:00
Treehugger Robot
258fca9a8f Merge "Move the stable code from version_defaults.mk to version_util.mk." 2021-09-16 18:56:09 +00:00
Yuntao Xu
2bf33c458f move cts-test-coverage
Moved cts-test-coverage from cts/build/ to build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts-test-coverage
Test: TreeHugger
Change-Id: I161adebc356b693329dfe48661476840c32beaa6
2021-09-16 11:55:08 -07:00
Yuntao Xu
34f50fefad Merge "Add android-cts-verifier.zip" am: a1b1f638d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673

Change-Id: Ib46b9e711faf8f663e1ba26a2e2ccf8d13b07f57
2021-09-16 17:22:44 +00:00
Presubmit Automerger Backend
541828d6f0 [conflict] [DO NOT MERGE] 2p: 0449bb97fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927

Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
2021-09-16 13:20:30 +00:00