Commit Graph

59415 Commits

Author SHA1 Message Date
Tianjie
a28c52661b Build the payload image only during apk-in-apex signing
When doing apk-in-apex signing, the package name is not reserved
during the apex repacking. As a result, the name accidentally
reverts to 'com.android.wifi' from 'com.google.android.wifi'.

This cl changes the behavior to call 'apexer' by passing the
'--payload_only' argument. So we don't build the apex file from
scratch and the old AndroidManifest.xml will be reused.

BUG: 152084536
Test: unit tests pass
Change-Id: I8332b2ee84832fb196f2e1c4309abac5ab92e153
Merged-In: I8332b2ee84832fb196f2e1c4309abac5ab92e153
2020-03-24 19:20:48 +00:00
Ulya Trafimovich
c282ece044 Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.

Bug: 147579140

Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
Merged-In: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
(cherry picked from commit c46e0673d0)
2020-03-24 17:09:47 +00:00
Makoto Onuki
a113ba1b35 Merge "Remove unnecessary dependency." into rvc-dev 2020-03-23 23:53:44 +00:00
Roshan Pius
8188a9c10d Merge "media_system.mk: Rename wifi-service to service-wifi" into rvc-dev 2020-03-23 23:06:22 +00:00
Aurimas Liutikas
7a1823a5f3 Remove unnecessary dependency.
This dependency is now defined in ALL_SDK_FILES.

Test: lunch sdk; make sdk
Bug: 151160048

Change-Id: Ia740466e493d745d83039ba9991547a6c2d3bd2c
Merged-in: Ia740466e493d745d83039ba9991547a6c2d3bd2c
2020-03-23 19:17:13 +00:00
Roshan Pius
fa756a8b1f media_system.mk: Rename wifi-service to service-wifi
Bug: 145195135
Test: Device boots up and connects to wifi networks.
Change-Id: I8ce4f53fc2bc0194040fd0fd7d50eeefbdde7192
2020-03-23 10:02:15 -07:00
Malcolm Chen
129b8f292b Move telephony framework sources as part of non-update framework.
This allows us to hide Telehony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I85626d8a427624264747eae56a6d7b5b4e537045
Merged-In: I85626d8a427624264747eae56a6d7b5b4e537045
2020-03-20 21:09:37 +00:00
Ulyana Trafimovich
c26cfa1c5a Merge "Put com.android.location.provider before services on the system server classpath." into rvc-dev 2020-03-20 11:00:35 +00:00
TreeHugger Robot
79875a125e Merge "initial GKI boot.img support" into rvc-dev 2020-03-20 00:50:28 +00:00
TreeHugger Robot
282bb78937 Merge changes from topic "vendor_skus" into rvc-dev
* changes:
  Also check empty SKU if SKUS are not defined
  Vendor SKU manifests: define env variables properly
2020-03-19 23:51:40 +00:00
Steve Muckle
e0c2dde572 initial GKI boot.img support
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Merged-In: I91181853b26815e68a2fa2216b68579780d034dc
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-19 15:35:23 -07:00
TreeHugger Robot
8a4d69f7e2 Merge "Add an RBE setup script that developers can source to run RBE builds" into rvc-dev 2020-03-19 22:06:50 +00:00
Yifan Hong
174b5be0bb Also check empty SKU if SKUS are not defined
In the case when both ODM_MANIFEST_SKUS and ODM_MANIFEST_FILE are
both empty, also checks VINTF compatibility for empty SKU case.

Same for device manifest. Although right now, DEVICE_MANIFEST_FILE and
DEVICE_MANIFEST_SKUS cannot be both empty (because libvintf requires
vendor manifest exists barring manifest fragments), let libvintf throws
an error for this case. In the build system, simply handle vendor manifest
the same way as ODM manifest.

Fixes: 148601741
Test: manual
Change-Id: Ia0655fd4d37f6286b164a3221ec4b2716f29147d
Merged-In: Ia0655fd4d37f6286b164a3221ec4b2716f29147d
2020-03-19 21:36:59 +00:00
Ulya Trafimovich
db088602f5 Put com.android.location.provider before services on the system server classpath.
Test: aosp_walleye-userdebug boots and there are no messages in the
  logcat regarding class loader context mismatch:

    $ adb logcat | grep 'mismatch'
    # empty

Bug: 147017252
Change-Id: I338685b9cf71681b5ca0c541752948934b656b46
2020-03-19 18:06:23 +00:00
Paul Scovanner
587ed4ff51 Update Security String to 2020-05-05 am: 776c7293fa
Change-Id: I8c035c3ce269f8875ecc76620537d874639a57e2
2020-03-19 17:32:25 +00:00
Paul Scovanner
776c7293fa Update Security String to 2020-05-05
Bug: 151752725
Change-Id: I4393eea75a53f90e23a53020b4a551228564e3cc
2020-03-19 04:40:18 +00:00
Yifan Hong
21ceb57057 Vendor SKU manifests: define env variables properly
In particular, BOARD_SEPOLICY_VERS may be defined in
system/sepolicy/Android.mk, so defer its evaluation.

Test: build with vendor SKU
Bug: 148601741
Change-Id: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
Merged-In: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
2020-03-18 17:58:52 -07:00
Paul Scovanner
dfebb45346 Update Security String to 2020-05-01 am: db9b1bd6fd
Change-Id: I7c75df48e4d4a0f450fd36e2319b434d92bd2bd5
2020-03-18 23:26:18 +00:00
Kousik Kumar
6a19b06296 Add an RBE setup script that developers can source to run RBE builds
Test: Ran "source build/envsetup.sh && source build/rbesetup.sh", then
ran "use_rbe m" and that worked.

Bug: b/150705712

Change-Id: I2d49fefbc1121f0d9c4e652396753b096e555a79
Merged-In: I2413a3648e9b2ff680cab6fededc07bbdd43378f
2020-03-18 10:27:05 -07:00
Paul Scovanner
db9b1bd6fd Update Security String to 2020-05-01
Bug: 151752725
Change-Id: Ief4b514032bfad1fad1a81c68b4f5e360569f105
2020-03-17 20:47:21 +00:00
Yifan Hong
1c146a617d Rename DEVICE_MANIFEST_<sku>_FILE to FILES
Use plural since multiple files can be defined and assembled together.

Test: pass
Bug: 148601741
Change-Id: I82a7aeb68ea26702e63757a41f32840b6186ab88
Merged-In: I82a7aeb68ea26702e63757a41f32840b6186ab88
2020-03-16 15:06:11 -07:00
Yifan Hong
922c38fb6e Proper checks for vendor and ODM SKUs
If DEVICE_MANIFEST_FILE / ODM_MANIFEST_FILES is set, also include check
for empty vendor / odm SKU, respectively. Then, do cross product of
vendor SKUs and ODM skus, and check each possible combination.

Test: build with and without vendor skus
Test: m check-vintf-all
Bug: 148601741

Change-Id: I23cc81998e7afc36c43540bf6d615b4d4b288447
Merged-In: I23cc81998e7afc36c43540bf6d615b4d4b288447
2020-03-16 15:06:11 -07:00
Xindong Xu
3e75aec327 ota_tool: fix incremental ota error
Problem:
Logical partitions do not update right since commit
f67dd8059d

    Generate block based OTA for product partitions

due to the wrong order of parameters. This is logged in
/tmp/recovery.log:

    skipping 0 blocks already patched to 202

Test: build
Bug: 149794632
Change-Id: I92f7a8a226a8a96b892254362d362c515bfb6dc6
(cherry picked from commit 2a7aaa69ae)
2020-03-13 13:03:10 -07:00
Yifan Hong
18f3e2d04b Merge "Build DEVICE manifests and fragments for each SKU" into rvc-dev 2020-03-11 18:44:36 +00:00
Jooyung Han
998ab5bf91 Merge "Remove vnd*.libraries.txt from /system/etc" into rvc-dev 2020-03-11 15:51:56 +00:00
Roopesh Nataraja
202d4c8db4 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
Merged-In: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-10 12:22:31 -07:00
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
Jooyung Han
f5e53004cd Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Merged-In: I85ab025e1ad490ee7704e4219c5ee611c83ca429
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
(cherry picked from commit 93cb9b5b31)
2020-03-08 13:11:24 +09: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