Commit Graph

29493 Commits

Author SHA1 Message Date
Ulyana Trafimovich
cfc3cc9ea0 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 am: e735b841e1 am: dfb7c60023
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Ia0cfda0783f102dede29427d2443f44e18dd73ba
2021-11-01 10:54:12 +00:00
Ulyana Trafimovich
dfb7c60023 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 am: e735b841e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: I02651b5a113a109347512305b1da15aafcea1022
2021-11-01 10:43:11 +00:00
Ulyana Trafimovich
e735b841e1 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Idab69065e3128bc13e518adbdb5a9d78ebf79854
2021-11-01 10:31:31 +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
Cheonho Park
51fb042cc2 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 check

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
(cherry picked from commit 32c048c379)
2021-10-30 03:24:33 +00:00
Treehugger Robot
d6dfa2a9b4 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03 am: 4cb46d6fc8 am: 690f6364e4
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I8a37a1aecdbf78392081130f69ef4a6805245c9b
2021-10-30 00:48:04 +00:00
Treehugger Robot
690f6364e4 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03 am: 4cb46d6fc8
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I7bd99e12e57af0d588e73c75c8d83c9215412a99
2021-10-30 00:30:32 +00:00
Treehugger Robot
4cb46d6fc8 Merge "Support custom APEX signing tool" am: 76a4c62f56 am: c24e277d03
Original change: https://android-review.googlesource.com/c/platform/build/+/1870245

Change-Id: I23891186e5413f7db813fab0b3dfde32e9a60e91
2021-10-30 00:13:05 +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
Treehugger Robot
3dd45cab17 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c724d)
2021-10-29 21:43:12 +00:00
Jiakai Zhang
61f6d4c38b Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80 am: 77734c2139 am: 6cc0fb496f
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: Iccbaf3e862e671245b3a8a6d75ecadfd3cc3b3e6
2021-10-29 19:16:32 +00:00
Jiakai Zhang
6cc0fb496f Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80 am: 77734c2139
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: I9b74436aefb43c1e24dfd87ab0bfa12d567f899d
2021-10-29 19:01:12 +00:00
Jiakai Zhang
77734c2139 Merge "Add a build-time check for dexpreopting system server jars." am: 3f35c93578 am: 7e6337ae80
Original change: https://android-review.googlesource.com/c/platform/build/+/1853593

Change-Id: I291206db9bf455f3895dcf4ed34401cf42be1d72
2021-10-29 18:43:00 +00: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
3e75d40186 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61 am: cd090c2a18 am: 1337bf9a18
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: I2bc213cf6221447f43987c23728a5593a4a09c17
2021-10-29 11:22:05 +00:00
Treehugger Robot
1337bf9a18 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61 am: cd090c2a18
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: I3e27dc9345622442d9a470ff10363ecff8fb5c76
2021-10-29 11:06:11 +00:00
Treehugger Robot
cd090c2a18 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" am: bf406bc182 am: 2191f99b61
Original change: https://android-review.googlesource.com/c/platform/build/+/1870248

Change-Id: Iee94290d6d959f8910bafc9a3925a19484d035f1
2021-10-29 10:49:09 +00:00
Treehugger Robot
bf406bc182 Merge "Use findstring to check MODULE_BUILD_FROM_SOURCE" 2021-10-29 10:18:07 +00:00
Treehugger Robot
98dd58b258 Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f am: c9e3f3799c am: 152b6e5021 am: 3ebfcd4b55
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: I8f7d2245f35124099115095631d30adc3ad909c0
2021-10-28 20:58:14 +00:00
Treehugger Robot
3ebfcd4b55 Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f am: c9e3f3799c am: 152b6e5021
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: I53aea00fb57331935cd1f40f5f9b361a466102f9
2021-10-28 20:42:09 +00:00
Treehugger Robot
152b6e5021 Merge changes from topics "is_board_platform", "soong_config_namespace" am: 2faf6d512f am: c9e3f3799c
Original change: https://android-review.googlesource.com/c/platform/build/+/1817592

Change-Id: Ie7209a143f54a12d51d1170148ad5151cf74a637
2021-10-28 20:30:42 +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
Alexander Smundak
f5f115e28c Merge "Provide abspath for backward compatibility." am: d79a15a8ad am: bcd3d8c4d0 am: 5541add6e2 am: ee177cdac2
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: Ia9ae68274f9847c40a96a0355a8ee8cc7c99967d
2021-10-26 18:24:43 +00:00
Alexander Smundak
ee177cdac2 Merge "Provide abspath for backward compatibility." am: d79a15a8ad am: bcd3d8c4d0 am: 5541add6e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: Ic91017eef8a609adcdb8c1c1ed9e692a37e6e25a
2021-10-26 18:06:14 +00:00
Alexander Smundak
5541add6e2 Merge "Provide abspath for backward compatibility." am: d79a15a8ad am: bcd3d8c4d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1836495

Change-Id: Iaff496df30b8a5dde5d6cd5ccad91bb739d341e5
2021-10-26 17:46:31 +00: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
53c2749e2a Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7 am: 392b2a862a am: 556830ad1e am: 4ca824ce0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: I39edd086187b6998bfd19754496fcd99a0a0a19e
2021-10-21 08:27:37 +00:00
Yi-Yo Chiang
4ca824ce0f Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7 am: 392b2a862a am: 556830ad1e
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: Ie3640dda0c19c27d6ba3e1b4496540ce12d49336
2021-10-21 08:15:07 +00:00
Yi-Yo Chiang
556830ad1e Merge "Revert "Renames boot-debug-*.img in GSI targets"" am: 09f68abca7 am: 392b2a862a
Original change: https://android-review.googlesource.com/c/platform/build/+/1856281

Change-Id: I2e78e1108dd509e40b7eb585da8856edb692940b
2021-10-21 07:57:59 +00:00
Yi-Yo Chiang
09f68abca7 Merge "Revert "Renames boot-debug-*.img in GSI targets"" 2021-10-21 07:22:03 +00:00
Treehugger Robot
60d8b5e12c Merge changes Ie7063c46,I4ffd21bd am: d3b5946171 am: e84dcc78f0 am: e61e3b6c5e am: b110a947c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: I4e868d1d35f197aa37c11cff38a534fe1566abbd
2021-10-20 21:20:17 +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
Treehugger Robot
b110a947c7 Merge changes Ie7063c46,I4ffd21bd am: d3b5946171 am: e84dcc78f0 am: e61e3b6c5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: I1ab84120c9dd113635a96ff216ffb4984e7fd785
2021-10-20 21:00:41 +00:00
Treehugger Robot
e61e3b6c5e Merge changes Ie7063c46,I4ffd21bd am: d3b5946171 am: e84dcc78f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1839718

Change-Id: I7d4a79c55b5ebc82f905ef28833b0e7a227ac7a6
2021-10-20 20:44:56 +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
Dan Willemsen
e7f38eb17f Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a am: 67dd4bb8f0 am: 4d18bcb141
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: Ice7bc7952463a6ff461655dc1d2288a576d0af81
2021-10-19 01:28:33 +00:00
Dan Willemsen
4d18bcb141 Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a am: 67dd4bb8f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: I4c7be9892793663243cbecf13f14ab2e2c8fb5db
2021-10-19 01:05:35 +00:00
Dan Willemsen
67dd4bb8f0 Merge "Shrink Mac builds" am: f478b8487b am: e666d6bf1a
Original change: https://android-review.googlesource.com/c/platform/build/+/1860157

Change-Id: Ic631807b15aa8310dbe06d3db413876646b95b31
2021-10-19 00:47:10 +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