Commit Graph

59388 Commits

Author SHA1 Message Date
Daniel Norman
ab5acefb6d RESTRICT AUTOMERGE Uses a per-partition fingerprint for building images and avb_salt.
This causes the output image files of a merged build to be identical
to the image files of the input partial builds, for each images in
PARTITIONS_WITH_CARE_MAP.

Test: python -m unittest test_common
Test: `m dist`; `unzip out/dist/target_files.zip IMAGES/\*`;
      `zip -d out/dist/target_files.zip IMAGES/\*`
      `add_img_to_target_files -a out/dist/target_files.zip`.
      Verify that the rebuilt images are identical to the deleted ones.
Test: Build a merged target (using merge_target_files.py). Verify that
      the partial target-files.zip IMAGES are identical to the merged
      target-files.zip IMAGES for PARTITIONS_WITH_CARE_MAP images.
Bug: 150405807
Change-Id: I5fdf5783c1aff9c14cf5408090389b1f65b69ca6
(cherry picked from commit d5fe862628)
2020-03-10 11:04:31 -07:00
Jiyong Park
79bf9640f4 system_server_current is accepted
Previously, has-system-sdk-version incorrectly returned true for
the sdk version 'system_server_current', just because it started with
system_. Since system_server_current is a totally different API surface
than system_*, make the macro to return false for system_server_*.

Bug: 146757305
Test: m
Test: add 'sdk_version: "system_server_current" to wifi-service-pre-jarjar
Change-Id: I43700545b0f120fa987696b8f03a4765d97e13e2
2020-03-07 18:34:57 +09:00
Bill Peckham
fbebe69ecf Merge "Don't touch .installable_files for non-FULL_BUILD" into rvc-dev 2020-03-05 22:03:47 +00:00
TreeHugger Robot
ba17b04741 Merge "DO NOT MERGE: Remove AppSearch from Android R." into rvc-dev 2020-03-05 21:08:59 +00:00
Bill Peckham
011255996c Don't touch .installable_files for non-FULL_BUILD
If we're not doing a full build, leave
$(PRODUCT_OUT)/.installable_files* alone rather
than truncating it. This prevents the clean logic
in Soong from removing everthing that we're trying
to use to build an image using the snod, vnod, etc.
goals.

Bug: 149460609
Test: make droid, make vnod, verify vendor.img
Change-Id: I612e32621b8045d085829507f22f6385b859f0c2
Merged-In: I612e32621b8045d085829507f22f6385b859f0c2
2020-03-05 11:20:33 -08:00
TreeHugger Robot
503e4884ab Merge "Support removing AVB public keys" into rvc-dev 2020-03-05 07:34:26 +00:00
Luke Huang
9fb9f8f870 Merge "DO NOT MERGE: Delete com.android.cronet from base_system." into rvc-dev 2020-03-04 03:45:40 +00:00
TreeHugger Robot
3eeca14b80 Merge "Fix signing on some GSI targets" into rvc-dev 2020-03-03 21:45:56 +00:00
Luke Huang
8640960329 DO NOT MERGE: Delete com.android.cronet from base_system.
Cronet module won't be in Android R.

Bug: 148046438
Test: Build
Change-Id: Ib20788edf9f94dcc03e0e5ff4c0ecb3c7042aee5
2020-03-03 11:31:24 +00:00
Bowgo Tsai
a7276405c9 Support removing AVB public keys
AVB public keys might be installed into the first-stage ramdisk.
This CL supports removing some AVB keys during the signing process,
which can be useful when a key needs to be revoked.

Also correcting the path of force_debuggable detection.

Bug: 150109393
Test: make dist
Test: ./build/tools/releasetools/sign_target_files_apks \
      --remove_avb_public_keys key1.avbpubkey,key2.avbpubkey \
      out/dist/*-target_files-*.zip signed-target_files.zip
Change-Id: I1af95adbbec655f40121f3392965dd1950aca4e5
Merged-In: I1af95adbbec655f40121f3392965dd1950aca4e5
(cherry picked from commit 2fe786a528)
2020-03-03 17:39:20 +08:00
Automerger Merge Worker
cff713200b [automerger skipped] Adding new GSI public keys am: c6f308b8e4 -s ours
am skip reason: Change-Id I69dd00dbb0046c681758068b8bbea0c08b9e2c91 with SHA-1 3c739746b3 is in history

Change-Id: I89ab75303177514f6bc6cf3022718d7e1fba1904
2020-03-02 21:30:46 +00:00
SzuWei Lin
f77e364de0 Fix signing on some GSI targets
GSI targets require enabling chain partition signing, which put the
GSI signing in system.ing directly instead of in vbmeta.img.

Some GSI targets inherit from BoardConfigGsiCommon.mk only, ex.
gsi_arm64-user, do not enable chain partition signing. The patch
add these settings back.

On the other hand, the emulator makefiles still requires the
settings at this time. Hence, we keep these settings in
BoardConfigEmuCommon.mk.

Bug: 150179516
Test: make gsi_arm64-user
Test: make aosp_arm64-user
Change-Id: Id188e4c6a31ce0cf9b134ebae36cbd5bfae19942
2020-03-02 16:06:02 +08:00
Songchun Fan
d20531a537 remove NativeAdbDataLoader from system image
Fixes build

Test: builds
BUG: 150476291
Change-Id: I5b5d6588fda4664bac9adce35adac92696d1d7f6
(cherry picked from commit 65c9699b70)
2020-02-28 20:56:12 +00:00
Tianjie Xu
e86d1bccc0 Preserve the monotonic property when subtracting 0 block
The monotonic property of the range is lost after the recent change to
subtract 0th block from the file range. As a result, we read the block
in the wrong order when pull files from the raw image. This yields a
incorrect hash during validation.

Bug: 150334561
Test: run validate_target_file. unittests
Change-Id: Id4fedaaf273c42c8d21a4549fda4c9a45e22066a
(cherry picked from commit f02ececc7f)
2020-02-27 13:24:11 -08:00
Alexander Dorokhine
75c5773187 DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I98774c8e8686b6d8fcb058ab0f1d5d4ecfa314cb
2020-02-25 17:24:36 -08:00
David Su
7b285149a3 Merge "Remove OsuLogin app from system image" 2020-02-21 19:11:08 +00:00
Automerger Merge Worker
87ca28cbfa Merge "Exclude holes from the block map." am: 9581181338 am: 4969b45d50 am: de72054e03
Change-Id: I46db3c1d99ab77d04171b7067e6303d91e626400
2020-02-21 18:05:55 +00:00
Automerger Merge Worker
de72054e03 Merge "Exclude holes from the block map." am: 9581181338 am: 4969b45d50
Change-Id: Idf4cf41cdcf58dcb0a905b2082ae6255fea26002
2020-02-21 17:43:17 +00:00
Automerger Merge Worker
4969b45d50 Merge "Exclude holes from the block map." am: 9581181338
Change-Id: If5d3ab4f9b344c45ff3a73248001ece532564698
2020-02-21 17:28:28 +00:00
David Anderson
9581181338 Merge "Exclude holes from the block map." 2020-02-21 17:04:11 +00:00
David Anderson
ab9c7e6d04 Exclude holes from the block map.
e2fsdroid can export holes as a "0" block, in order to make sure logical
and physical block assignments are maintained properly. Exclude these
hole blocks from range sets in LoadFileBlockMap.

Bug: 139201772
Test: m dist on non-A/B
Change-Id: Ic04e869572229678fdeaaa6fbf6f464d6c672051
2020-02-21 17:04:00 +00:00
Haoxiang Li
0ea8dc1cb4 [SV HIDL] Update VNDK library list
Bug: 148618804

Test: Build passed.

Change-Id: Iff0738ffc4827a9713f3a82da05eb8adf47f87fe
2020-02-21 06:28:40 +00:00
Automerger Merge Worker
4c95a5a6eb Merge "do not clear output kernel module directory" am: 733ad20963 am: d8d9a50090 am: 19c6758950
Change-Id: I4f8eb228d8b0e2658039ec13c81931b2c16bfee7
2020-02-21 01:39:25 +00:00
Automerger Merge Worker
19c6758950 Merge "do not clear output kernel module directory" am: 733ad20963 am: d8d9a50090
Change-Id: I56f8286c33e018b40862c669e5ef3e9bb21a889f
2020-02-21 01:28:43 +00:00
Automerger Merge Worker
d8d9a50090 Merge "do not clear output kernel module directory" am: 733ad20963
Change-Id: I9de52a01cf0c04f909dcd711d8bd152fa3bf9b50
2020-02-21 01:17:24 +00:00
Treehugger Robot
733ad20963 Merge "do not clear output kernel module directory" 2020-02-21 01:02:09 +00:00
Roshan Pius
5229d94ed7 Merge "base_system.mk: Package wifi.rc separately into the build" 2020-02-20 19:51:21 +00:00
Automerger Merge Worker
d32f2402f0 [automerger skipped] Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05 am: e4d9c62b0d am: 0d54bb5962 -s ours
am skip reason: Change-Id I3126605613202b1e981b4e7f594acb6edbb7d635 with SHA-1 1173332eb2 is in history

Change-Id: I9f2fcfa6d65b698172c5f9d305cb6ad7d16b3727
2020-02-20 19:32:07 +00:00
Automerger Merge Worker
0d54bb5962 Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05 am: e4d9c62b0d
Change-Id: Ia35da14f15584aa00e9bbf4d91ce753377b18235
2020-02-20 19:21:04 +00:00
Automerger Merge Worker
e4d9c62b0d Merge "Load ike in system server classpath instead of bootclasspath" am: 77001add05
Change-Id: I8449124d6ec7a9d90386c25abb247db975277c3a
2020-02-20 19:00:03 +00:00
Yan Yan
77001add05 Merge "Load ike in system server classpath instead of bootclasspath" 2020-02-20 18:38:55 +00:00
Steve Muckle
5e0ff33d0f do not clear output kernel module directory
When using an archive to provide kernel modules, the archive is directly
expanded into the output directory. The output directory is currently
removed prior to that to ensure no stale modules are present if they
were removed as part of a change in an incremental build.

Unfortunately if kernel modules are also provided via the regular
BOARD_*_KERNEL_MODULES macros, the removal of the output kernel module
directory will race with the copying of kernel modules in
BOARD_*_KERNEL_MODULES, resulting in some of those kernel modules not
being present in the output.

Kernel modules removed from BOARD_*_KERNEL_MODULES do not currently get
removed from the output directory in an incremental build anyway. So in
order to support using BOARD_*_KERNEL_MODULES and
BOARD_*_KERNEL_MODULES_ARCHIVE conurrently, take out the removal of the
output directory prior to archive expansion.

Bug: 149866863
Change-Id: Ib373650ddcb0fb5782a13d68a8869a9117e42ccc
2020-02-20 10:19:06 -08:00
Colin Cross
c25ac460a4 Merge "Mark the current BUILD_* warnings as errors by default" 2020-02-20 17:47:14 +00:00
Roshan Pius
af116f56bd base_system.mk: Package wifi.rc separately into the build
These contain a bunch of action triggers for setting some kernel flags
for wifi driver logging. Apex'es don't support .rc with action triggers,
so package it separately into the build.

Bug: 149909892
Test: Device boots up and connects to wifi networks.
Test: Manually verified that the .rc file is run on bootup.
Change-Id: I05f055ec68d47a1d158135f5454389a786884f9b
2020-02-20 07:51:02 -08:00
Howard Ro
ac79359a25 Merge "Remove statsd binary from base_system.mk" 2020-02-20 08:00:53 +00:00
Automerger Merge Worker
ba2170d59d Merge "Adding new GSI public keys" am: 1f82728d94 am: 84a1838b46 am: 4da91bcafd
Change-Id: Id5d5df0b0ea015aeec32c59b315d850dfb366f10
2020-02-20 06:52:30 +00:00
Yan Yan
4d19b14e7b Merge "Load ike in system server classpath instead of bootclasspath" 2020-02-20 06:42:22 +00:00
Automerger Merge Worker
4da91bcafd Merge "Adding new GSI public keys" am: 1f82728d94 am: 84a1838b46
Change-Id: I7f8c380e812a36dc3edc571914ea2dc31f0a08c8
2020-02-20 06:40:04 +00:00
Automerger Merge Worker
84a1838b46 Merge "Adding new GSI public keys" am: 1f82728d94
Change-Id: I877229f94a92dc8c794b9df9c2a5b21676c66d72
2020-02-20 06:28:03 +00:00
Treehugger Robot
1f82728d94 Merge "Adding new GSI public keys" 2020-02-20 06:18:41 +00:00
evitayan
781145ee4c Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
Merged-In: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-20 05:51:12 +00:00
Howard Ro
26490fb2b4 Remove statsd binary from base_system.mk
Now that statsd binary is moving to the apex, we should remove it from
base_system.mk. Also, we noticed that the statsd apex name is defined
twice. So we also removed the duplicate line.

Test: make
Bug: 145923087
Change-Id: Ic974ac1506e4dafa310fcd4727852d3188eb2885
2020-02-19 20:52:16 -08:00
Automerger Merge Worker
dfa3d23969 Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7 am: e1570cb99d am: a20bb6522a
Change-Id: Ic5ec4776d4daa91a1423b65d96e34026756ae9ad
2020-02-20 04:44:58 +00:00
Automerger Merge Worker
a20bb6522a Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7 am: e1570cb99d
Change-Id: Iadf152de8025a8be1a8b24dd07bf3be357e8c077
2020-02-20 04:27:34 +00:00
Automerger Merge Worker
e1570cb99d Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7
Change-Id: I48f3ded6c5c63aa9a828a529880f0cdb2918f8e2
2020-02-20 04:12:10 +00:00
Treehugger Robot
31d4a5aed7 Merge "Adding vendor_boot-debug.img" 2020-02-20 03:56:58 +00:00
Automerger Merge Worker
a86e4852e1 Merge "Add a module for VNDK library lists" am: 63c28a8bd9 am: 7785e7a030 am: f89db1e188
Change-Id: Iceb13ec74613b60075e23d5bbf1f77e6557ef5b7
2020-02-20 02:50:16 +00:00
Automerger Merge Worker
f89db1e188 Merge "Add a module for VNDK library lists" am: 63c28a8bd9 am: 7785e7a030
Change-Id: Ia208d7b7f9c88e601fcb1db888d7cff48e1aa3e3
2020-02-20 02:37:12 +00:00
Automerger Merge Worker
7785e7a030 Merge "Add a module for VNDK library lists" am: 63c28a8bd9
Change-Id: I7888acfb4282a6f20fb5c83215bda546aace734d
2020-02-20 02:22:25 +00:00
Dan Willemsen
c4bdff5f7e Mark the current BUILD_* warnings as errors by default
This switches:

  BUILD_COPY_HEADERS / LOCAL_COPY_HEADERS
  BUILD_HOST_EXECUTABLE
  BUILD_HOST_SHARED_LIBRARY
  BUILD_HOST_STATIC_LIBRARY

to errors by default. Devices can set
BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE (etc) to turn these errors back
to warnings. I've done that for all of our internal devices.

Bug: 130719878
Bug: 130696912
Bug: 130722971
Bug: 130723227
Test: remove the BUILD_BROKEN_USES_* lines from a device, see errors
Change-Id: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
2020-02-19 18:11:18 -08:00