Commit graph

70659 commits

Author SHA1 Message Date
TreeHugger Robot
7e2e4be86c Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev
* changes:
  Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
  Revert "Directly create ramdisk dirs in ramdisk image rule"
  Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
2021-07-07 03:02:00 +00:00
Martin Stjernholm
6a3fd20b35 DO NOT MERGE: Use prebuilts of the ART Module by default (reland).
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

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

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

This relands http://ag/13552665 after updating ART prebuilts
(ag/15189174, ag/15200785). Using DO NOT MERGE to have the same scope
as they do.

Test: presubmits
Test: vendor/google/build/build_mainline_modules.sh
  with a line
    build/soong/soong_ui.bash --dumpvar-mode \
      SOONG_CONFIG_art_module_source_build
  directly before the module build commands in
  build_unbundled_mainline_module.sh and check that it's still true.
Bug: 192542393
Change-Id: I6281ef27bf9cdcb2ad5112b8a0932e4201d69dc2
2021-07-05 01:21:54 +01:00
TreeHugger Robot
69f66460de Merge "Delete com.android.cronet from base_system" into sc-dev 2021-07-02 09:03:40 +00:00
Paul Scovanner
22d840e154 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 7800a61f24 -s ours
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I463f69407d1dc99773dc760cacc000a9d50d13b8
2021-07-02 00:43:18 +00:00
Paul Scovanner
81728953b4 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours am: 21691ce5f4 -s ours
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: Ifa2011aaacb8f6a2697e071fd3ad5c5268f5240c
2021-07-02 00:42:18 +00:00
Paul Scovanner
7800a61f24 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I68488fe5ebaa9ff601537e229d62aaa2c4497ab3
2021-07-02 00:26:06 +00:00
Paul Scovanner
21691ce5f4 [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours am: 76530937da -s ours
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I860c4eceb7fa11c996b16ca660f81027398ff617
2021-07-02 00:26:05 +00:00
Paul Scovanner
76530937da [automerger skipped] Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f am: 28bb26cec7 -s ours
am skip reason: Merged-In Icea699ec7f82744ff0a6dca90068b2737129778a with SHA-1 cfd4896dc2 is already in history

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

Change-Id: I0edba4615416cd7a867ca367318e3a9db76dcc60
2021-07-02 00:12:36 +00:00
Paul Scovanner
28bb26cec7 Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: Id32d0b6aa4a12afd336ed79b1dc61e0cc4c96065
2021-07-01 23:51:19 +00:00
Paul Scovanner
abecfaa90f Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I78b8f8bf0fb3dd657b1cef238395d8aa73784cbe
2021-07-01 23:36:15 +00:00
Paul Scovanner
996d1d3a4f Update Security String to 2021-09-01 am: 639164b255
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I2d98e6e8f13a7146d946fd38a7bd9400197a0151
2021-07-01 23:15:23 +00:00
Martin Stjernholm
3d8c30792b Merge "Revert "Use prebuilts of the ART Module by default."" into sc-dev 2021-07-01 16:14:49 +00:00
Martin Stjernholm
751f1ddbef Revert "Use prebuilts of the ART Module by default."
This reverts commit efab03ff61.

Reason for revert: Breaks sc-dev builds.

Merged-In set to http://ag/15107826 to avoid merging downstream.

Bug: 192558747
Change-Id: Id17caafee41b5aed65b5b294c729a548379aa41a
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
2021-07-01 16:12:43 +00:00
Martin Stjernholm
b832fba84c Merge "Use prebuilts of the ART Module by default." into sc-dev 2021-07-01 14:57:38 +00:00
Martin Stjernholm
efab03ff61 Use prebuilts of the ART Module by default.
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

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

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

Merged-In set to http://ag/15107826 to avoid merging downstream.

Test: presubmits
Test: vendor/google/build/build_mainline_modules.sh
  with a line
    build/soong/soong_ui.bash --dumpvar-mode \
      SOONG_CONFIG_art_module_source_build
  directly before the module build commands in
  build_unbundled_mainline_module.sh and check that it's still true.
Bug: 192542393
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
Change-Id: Id719640d17effca107af82de69e45514bf3bd234
2021-07-01 14:20:21 +01:00
Inseob Kim
69389a1c3a Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I5e1d58bdb3ebff7125b64a8f2e940f7d203dac74
2021-07-01 06:50:40 +00:00
Inseob Kim
ef49dc6daa Revert "Directly create ramdisk dirs in ramdisk image rule"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: Ic72702cf9d48367b3de30cf29f68a7e8fb0040ce
2021-07-01 06:50:40 +00:00
Inseob Kim
e683a5fcea Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I2fe09d7a44567f5f3cfd08c89a60e9e94e8fe0e3
2021-07-01 06:50:40 +00:00
Paul Scovanner
46fb33d93a Update Security String to 2021-09-05 am: cfd4896dc2 am: 8cc4ed6de3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I717558090f790d8883bfda0ac019283758b1a7b2
2021-06-30 22:52:43 +00:00
Paul Scovanner
7df23ee7aa Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
2021-06-30 22:52:04 +00:00
Paul Scovanner
8cc4ed6de3 Update Security String to 2021-09-05 am: cfd4896dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I2e952857242dae3015c71903ea4353c42185be5d
2021-06-30 22:37:04 +00:00
Paul Scovanner
e88ac64d3d Update Security String to 2021-09-05 am: cfd4896dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: Ic0a375700bd7dc707449ced79e0efe893cc43a25
2021-06-30 22:37:02 +00:00
TreeHugger Robot
744d6629d2 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" into sc-dev 2021-06-30 17:16:25 +00:00
Martin Stjernholm
a18d4d84db Merge "Force building ART from source for AOSP products." into sc-dev 2021-06-30 14:55:56 +00:00
Neil Fuller
59b80b91a4 Merge "Remove com.android.geotz jar from system server" into sc-dev 2021-06-30 10:54:44 +00:00
Paul Scovanner
639164b255 Update Security String to 2021-09-01
Bug: 192405736
Change-Id: Ie53aed2831d96e9806657e9b8472805f36d54419
Merged-In: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 01:38:32 +00:00
Paul Scovanner
cfd4896dc2 Update Security String to 2021-09-05
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 00:36:24 +00:00
Martin Stjernholm
43747aafb1 Force building ART from source for AOSP products.
This is a workaround for the problem that we cannot control from make
which APEX gets picked for deapexing.

Test: env TARGET_PRODUCT=aosp_cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows true
Test: env TARGET_PRODUCT=cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows false
Bug: 192006406
Bug: 172480615
Change-Id: I8990b726affeb08eabf130d20be45129a7c1c58d
2021-06-29 19:26:31 +01:00
SzuWei Lin
e0e5b6a93f Include kernel-*-allsyms into boot-*-allsyms.img
The patch fixes the boot-*-allsyms.img of gsi_arm64-userdebug to
pack the kernel with allsyms instead of without allsyms.

Bug: 192318869
Test: build gsi_arm64-userdebug; check the kernel in boot-*-allsyms.img
Test: build gsi_x86_64-userdebug; check the kernel in boot-*-allsyms.img
Change-Id: Ic89dbe27e166d57283c7bef574d525863d20e79f
Merged-In: Ic89dbe27e166d57283c7bef574d525863d20e79f
2021-06-29 17:15:29 +08:00
Martin Stjernholm
525823ab95 Do not complain about unexpected lsdump files when building with
prebuilt APEXes.

Cherry-picked from https://r.android.com/1748082.

Test: m droid SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Change-Id: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
Merged-In: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
2021-06-28 15:58:45 +01:00
Neil Fuller
5ee2173c05 Remove com.android.geotz jar from system server
This commit removes the com.android.geotz apex from the build.

This apex is associated with the "offline" location time zone provider
from the nascent com.android.geotz module, which has been configured as
the "secondary" provider. This module will not to be updatable in S so
needs to be removed before release.

This is effectively a revert of commit
6009a0a38f.

Bug: 178169250
Bug: 172546738
Test: treehugger
Change-Id: I734388383030984d5c3e7a1373a77da013a6cb8e
2021-06-28 14:04:54 +00:00
Dario Freni
14abe199e2 Merge "Add MODULE_BUILD_FROM_SOURCE env variable." into sc-dev 2021-06-25 13:53:41 +00:00
TreeHugger Robot
1e6044e5da Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev 2021-06-24 23:59:05 +00:00
Dario Freni
84d3bf7a2f Add MODULE_BUILD_FROM_SOURCE env variable.
When set, module builds will prefer source where applicable.

Bug: 191978129
Test: m; MODULE_BUILD_FROM_SOURCE=true m
Change-Id: Ie7f928674a511a98f17653fa814a42194ee0e9f9
Merged-In: Ie7f928674a511a98f17653fa814a42194ee0e9f9
2021-06-24 17:37:50 +00:00
Jeongik Cha
5612cff4b4 Emit DexPreoptImageLocationsOnDevice as well
Bug: 158843648
Test: check if dexpreopt config for the module defined in mk has
DexPreoptImageLocationsOnDevice field.

Change-Id: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
Merged-In: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
(cherry picked from commit 242c436242)
2021-06-24 13:14:29 +00:00
Luke Huang
bdb359aef5 Delete com.android.cronet from base_system
No concrete plan to ship Cronet for now

Bug: 188872256
Test: TH
Merged-In: I86f659de4a956a3186f21a5333781b92b71e7c17
Change-Id: Ic3deabca3794d1541668b45e8e63d99a7345adfd
2021-06-23 08:46:46 +00:00
Inseob Kim
94b0556c4e Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Bug: 190974433
Test: build
Change-Id: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
Merged-In: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
2021-06-23 04:39:04 +00:00
Inseob Kim
f3897b668d 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
Merged-In: Ic76c325ce102347f20b282572e3edbb5b4359aaf
2021-06-23 04:38:55 +00:00
Inseob Kim
a9af042d58 Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
It'll be used from init_first_stage.

Bug: 187196593
Test: build
Change-Id: I4c5374debd56fbf9d11b456498835a9c411d01d6
Merged-In: I4c5374debd56fbf9d11b456498835a9c411d01d6
2021-06-23 04:33:18 +00:00
Devin Moore
36b659550e Revert "Throw an error if androidboot.hardware is used for bootconfig"
This reverts commit 2e43e34d53.

The kernel bootconfig feature has been updated to handle mixed subkeys
and values, so androidboot.hardware is ok to use now.

Test: build and boot cuttlefish with 'hardware=cutf_vm'
Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm'
Bug: 191502832
Merged-In: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
2021-06-21 12:48:24 -07:00
TreeHugger Robot
122a00734b Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev 2021-06-21 04:58:20 +00:00
Hridya Valsaraju
dbc00eb135 Disable build-time debugfs restrictions on GSI builds
These restrictions enable macros that disable sepolicy access to debugfs
for unauthorized clients on S-launching devices. However, since the
Android S GSI build must also be fully functional on earlier devices
that could have possibly depended on debugfs, disable the build-time
restrictions on GSI builds.

Bug: 184381659
Test: make
Change-Id: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
Merged-In: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-18 17:50:12 +00:00
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
TreeHugger Robot
e77729e02b Merge "Remove mainline boot.img from GSI targets" into sc-dev 2021-06-17 10:18:43 +00: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
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
SzuWei Lin
870752dfd2 Remove mainline boot.img from GSI targets
Originally, the mainline kernel is for Android12.
The mainline kernel is changing to the next Android version.
We don't need to includes mainline boot.img in GSI targets.

Bug: 191120961
Test: TH and check the built result
Change-Id: Icd7677f362077eb675760d51a8f01c5db8baf7e1
2021-06-15 16:43:46 +08:00
Paul Scovanner
acc10d23e1 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: c2c92bc5c3 -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

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

Change-Id: Id998e7d3494e7f20ab5fe56ec26c3644017880ca
2021-06-15 06:30:05 +00:00
Paul Scovanner
0c8423765d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: 99c5b6455d -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

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

Change-Id: I298831d046a3e68ed0015d07f730811577de9c44
2021-06-15 06:29:39 +00:00