Commit Graph

27520 Commits

Author SHA1 Message Date
TreeHugger Robot
c66099dcc6 Merge changes Ie63d08ac,Ia7f8200c into sc-dev
* changes:
  Fix typo in droidcore-unbundled.
  Introduce droidcore-unbundled target
2021-06-17 15:01:07 +00:00
Bill Peckham
d07e1c0077 Fix typo in droidcore-unbundled.
Test: manual inspection.
Bug: 191304308
Merged-In: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-16 20:54:39 -07:00
Bill Peckham
184524a915 Fix typo in droidcore-unbundled.
Test: manual inspection.
Bug: 191304308
Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-17 03:33:09 +00:00
Colin Cross
01b2d0cda9 Master is T
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
(cherry picked from commit 5e9ba92e05)
2021-06-16 21:39:44 +00:00
TreeHugger Robot
6e2acf1c60 Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev 2021-06-16 20:48:16 +00:00
Bill Peckham
315b98a73a Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
(cherry picked from commit 0a30cc41bc)
2021-06-16 19:54:07 +00:00
Bill Peckham
16da01fe20 Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Merged-In: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
2021-06-16 09:10:07 -07:00
Inseob Kim
b8e274097d Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Bug: 190974433
Test: build
Change-Id: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
2021-06-16 21:08:49 +09:00
Inseob Kim
adcdb2fbda Directly create ramdisk dirs in ramdisk image rule
These directories have been created with post install cmds of
init_first_stage. To migrate init_first_stage to Soong, the directory
rules are now written directly in ramdisk image rule.

Bug: 187196593
Test: "m installclean; m" and see ramdisk output
Change-Id: Ic76c325ce102347f20b282572e3edbb5b4359aaf
2021-06-16 20:58:59 +09:00
Inseob Kim
1d4081b2a5 Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
It'll be used from init_first_stage.

Bug: 187196593
Test: build
Change-Id: I4c5374debd56fbf9d11b456498835a9c411d01d6
2021-06-16 20:58:59 +09:00
Inseob Kim
94c27efb68 Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 189161483
Test: m selinux_policy
Change-Id: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
2021-06-16 02:25:48 +00:00
android-build-team Robot
9253f10393 Make change and version bump to RQ3A.210805.001
Change-Id: I0c80d56c5ec688926dd3d6b386463fa07e872572
2021-06-16 01:13:37 +00:00
Paul Scovanner
5b94f1a3b5 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
(cherry picked from commit f5139e3087)
2021-06-16 01:10:59 +00:00
Colin Cross
5e9ba92e05 Master is T
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-06-15 13:31:59 +00:00
Jeff Sharkey
3159f8f31b [DO NOT MERGE] platform/build/make - S is now REL am: 25d421446d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: Ibe070a1f81c5e6456bc57a0d24df470e608e2de7
2021-06-15 03:54:47 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Kelvin Zhang
9b55885314 Add ro.vendor.build.dont_use_vabc to disable VABC OTA
This prop is owned by OEM, OEM can set this if they want to disable
VABC.

Test: m dist, make sure generated OTA has VABC disabled
Bug: 185400304

Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
Merged-In: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
2021-06-14 15:38:37 -07:00
Paul Scovanner
c57c536e09 Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff am: 073480991e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I022dde955d07bc828b55474008fe5ff4f0362d71
2021-06-14 22:02:19 +00:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14 21:56:38 +00:00
Paul Scovanner
7e1e5ad8ff Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Icbeccbd10e0496e7a38720f165b0868954939a51
2021-06-14 21:39:09 +00:00
Treehugger Robot
6b0f56a5fc Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" am: c09cda8c6c am: 61a1d6d7a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1734412

Change-Id: I0cdfa2823cc075dce0fe75df2a36c1731ea15155
2021-06-14 19:13:17 +00:00
Treehugger Robot
61a1d6d7a3 Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" am: c09cda8c6c
Original change: https://android-review.googlesource.com/c/platform/build/+/1734412

Change-Id: I97143fdf5e4239085aa0e3581c79a640a1166745
2021-06-14 18:58:47 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Kelvin Zhang
10eac08fe1 Add ro.vendor.build.dont_use_vabc to disable VABC OTA
This prop is owned by OEM, OEM can set this if they want to disable
VABC.

Test: m dist, make sure generated OTA has VABC disabled
Bug: 185400304

Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
2021-06-14 10:23:14 -04:00
Devin Moore
d77608cbdf Merge "Add vendor-bootconfig.img to target-files-package" am: 55987b5745 am: 7651e75f37
Original change: https://android-review.googlesource.com/c/platform/build/+/1732636

Change-Id: I912001bd2615dc69e8046890c3d5294e48f18fa5
2021-06-10 21:39:35 +00:00
Devin Moore
7651e75f37 Merge "Add vendor-bootconfig.img to target-files-package" am: 55987b5745
Original change: https://android-review.googlesource.com/c/platform/build/+/1732636

Change-Id: I6c211a83af5ef987e12ad8191541364d985a7b04
2021-06-10 21:25:11 +00:00
Devin Moore
55987b5745 Merge "Add vendor-bootconfig.img to target-files-package" 2021-06-10 21:08:17 +00:00
Jeff Sharkey
25d421446d [DO NOT MERGE] platform/build/make - S is now REL
Bug: 171506470
Test: Build
Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
2021-06-10 15:05:11 -06:00
Inseob Kim
fb85d6b284 Merge "Remove redundant dependency to API_FINGERPRINT" am: 0e257fcb28 am: 8de9f9bcf5
Original change: https://android-review.googlesource.com/c/platform/build/+/1730121

Change-Id: I5b8ca320ff7f3444b520867eae965a630384fb7b
2021-06-10 02:32:41 +00:00
Inseob Kim
8de9f9bcf5 Merge "Remove redundant dependency to API_FINGERPRINT" am: 0e257fcb28
Original change: https://android-review.googlesource.com/c/platform/build/+/1730121

Change-Id: I3c25d77f9ff66a5dd12a88966d4a4ae5ac4697d1
2021-06-10 02:04:17 +00:00
Inseob Kim
0e257fcb28 Merge "Remove redundant dependency to API_FINGERPRINT" 2021-06-10 01:34:25 +00:00
Devin Moore
55af5065dc Add vendor-bootconfig.img to target-files-package
INTERNAL_VENDOR_BOOTCONFIG_TARGET is a required dependency of
target-files-package so it can be built from a clean build.

Test: rm -rf out/target/product && m target-files-package
Bug: 190329824
Change-Id: I9873aee3c9fb303d2ad245b5433d13eb76ab55f9
2021-06-09 13:19:13 -07:00
Jaegeuk Kim
7e5a001153 Merge "Missing required packages for f2fs when building ota package" into sc-dev am: 6279b6c511
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910115

Change-Id: I30234d5a395737a51d150725e34a59a301ffe3be
2021-06-09 17:12:48 +00:00
Treehugger Robot
78d09c6177 Merge "Missing required packages for f2fs when building ota package" am: 9d4b9bb50c
Original change: https://android-review.googlesource.com/c/platform/build/+/1730911

Change-Id: I7b0a056986d0a29beb0a7d265f35ee0f5c851f7e
2021-06-09 17:05:13 +00:00
Jaegeuk Kim
6279b6c511 Merge "Missing required packages for f2fs when building ota package" into sc-dev 2021-06-09 16:50:29 +00:00
Inseob Kim
2a70ea0dce Remove redundant dependency to API_FINGERPRINT
API_FINGERPRINT is only used from buildinfo.prop.

Bug: 188068953
Test: build
Change-Id: I4804d3e61d0bac83c59c54751209bf47404e3a31
2021-06-09 17:36:08 +09:00
Jaegeuk Kim
1f50a36c62 Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-08 19:12:15 -07:00
Jaegeuk Kim
01da65f93a Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
Merged-In: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-09 02:11:23 +00:00
TreeHugger Robot
1efb38582a Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev 2021-06-07 00:57:19 +00:00
Jeongik Cha
5b1d149586 RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
Merged-In: I94e3122372dd20c942b2c858070a6ca797312792
(cherry picked from commit f93c13d51b)
2021-06-04 00:05:55 +00:00
Yuntao Xu
ee58bb67a5 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
Merged-In: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-06-03 10:22:53 -07:00
Tianjie Xu
b195f48ce9 Merge "Check super size for factory OTA at build time" into sc-dev 2021-06-02 21:53:36 +00:00
Jeff Sharkey
2ec10e7543 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I68f42fbd7ef09dd357d010ac9a27272696414519
2021-06-02 20:14:08 +00:00
Jeff Sharkey
83ecfb5073 Merge "platform/build/make - S is now 31" into sc-dev 2021-06-02 20:11:14 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Treehugger Robot
6ac14409a7 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c55374 am: 72bde32481
Original change: https://android-review.googlesource.com/c/platform/build/+/1722679

Change-Id: I925788776c863d898928bee8b0e2ab131c8b925a
2021-06-02 03:39:08 +00:00
Treehugger Robot
72bde32481 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c55374
Original change: https://android-review.googlesource.com/c/platform/build/+/1722679

Change-Id: Iec1fae418dfe596185e40d4cab1c2e1fc9f9aef3
2021-06-02 03:13:31 +00:00
Treehugger Robot
a7f8c55374 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" 2021-06-02 02:55:07 +00:00
Yuntao Xu
0f28440f60 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" am: f6cff22181 am: cfc1765cbd
Original change: https://android-review.googlesource.com/c/platform/build/+/1719472

Change-Id: I22a0925bca0601c4dc39375b2da4fdc340e7cefb
2021-06-01 22:27:53 +00:00
Colin Cross
5ef69b1ed4 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b am: e131ab1e10
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
2021-06-01 22:27:44 +00:00