Commit graph

70936 commits

Author SHA1 Message Date
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
23894d4fc4 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" into sc-dev am: 744d6629d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15135721

Change-Id: I659e0bc0fb78ccaf6ea60d546b7275c2adf7ef26
2021-06-30 17:33:50 +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
c19612b8a3 Merge "Force building ART from source for AOSP products." into sc-dev am: a18d4d84db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15107826

Change-Id: I45e67ad86dc0397ab3a123c01a9c7cfeb83717ff
2021-06-30 15:09:56 +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
27dacbc582 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I3265bde88f46d5f7ccb565f3201ee2ba68afb572
2021-06-30 11:07:58 +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
Martin Stjernholm
670b5a2aa5 Do not complain about unexpected lsdump files when building with am: 525823ab95
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15114073

Change-Id: I5de3a36a2ee9832f8f970578b5ce276f28648d9c
2021-06-29 15:30:47 +00: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
5301b846f3 Merge "Add MODULE_BUILD_FROM_SOURCE env variable." into sc-dev am: 14abe199e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15090043

Change-Id: Iaf388de4a3c5da83a60f5a71cee5d39d18f6f3fa
2021-06-25 14:13:05 +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
abeb9ec656 Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev am: 1e6044e5da
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15088021

Change-Id: I4724183a24345603449a84d7d29797b3b71cd059
2021-06-25 00:14:37 +00:00
TreeHugger Robot
1e6044e5da Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev 2021-06-24 23:59:05 +00:00
Inseob Kim
6bcad4a519 Add BUILD_USES_RECOVERY_AS_BOOT to soong config am: 94b0556c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070334

Change-Id: Iaae16de89c09cb7b99e5b0addf540860d64fb452
2021-06-24 23:44:14 +00:00
Inseob Kim
3798b390aa Directly create ramdisk dirs in ramdisk image rule am: f3897b668d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070333

Change-Id: Ideb92d32cb70502b1e917dd8521db2f25fa8ca63
2021-06-24 23:44:07 +00:00
Inseob Kim
69326d77ab Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars am: a9af042d58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070332

Change-Id: I1160df4e119644d2022eeca3879e25487c2c30df
2021-06-24 23:44:00 +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
0fae78cd7a Revert "Throw an error if androidboot.hardware is used for bootconfig" am: 36b659550e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15054410

Change-Id: I53c39254879e4485eaad229bf05ed3844b231cf3
2021-06-22 18:08:43 +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
805eadef1a Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev am: 122a00734b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15028539

Change-Id: I1bbed31ac76112874863fe7d41fba50855f4709c
2021-06-21 05:22:24 +00: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
ce53a0ff9e Merge changes Ie63d08ac,Ia7f8200c into sc-dev am: c66099dcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15008279

Change-Id: I260893b558d643c29983d3c5f217c0b136237714
2021-06-17 15:19:19 +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
8c10353f7b Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14965951

Change-Id: Idf95b292085c4eb05d9e3cc6cfa9f2c70d9c9ea7
2021-06-17 10:39:35 +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
6aacf83adf Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev am: 6e2acf1c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14970372

Change-Id: I758ee84f90e237eb4f4617b72a0345a6b06f06eb
2021-06-16 21:08:02 +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
5e2beb9405 [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: acc10d23e1 -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: I7bb3630f135796c7266d66c06831f94578a077aa
2021-06-15 06:44:11 +00:00
Paul Scovanner
6e77ba8a4b [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: 0c8423765d -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: I7eaee7f343ea97df5a182e64940a4ecca603a301
2021-06-15 06:44:06 +00: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
Paul Scovanner
c2c92bc5c3 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -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: I56feff4d4b4025cb6a97932ba81c37f51f670688
2021-06-15 06:17:15 +00:00
Paul Scovanner
99c5b6455d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -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: I23c435730fd123c983d82dee6e83d7112d633615
2021-06-15 06:17:15 +00:00
Paul Scovanner
4c6a6534b5 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -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: Ic14d7d2f3f00bc26d7ca45f5705e6b60eda6a04d
2021-06-15 06:07:41 +00:00
Paul Scovanner
d4f2c30487 Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I83c72777cf01ff01eb99c08f48efa1522fb147e5
2021-06-15 05:52:10 +00:00