Commit Graph

55547 Commits

Author SHA1 Message Date
Vic Yang 0408a6e182 Set TARGET_VNDK_USE_CORE_VARIANT for Go devices
Bug: 119423884
Test: Build a Go device, boot, and check ld.config.txt.
Change-Id: Id996b7b77991ee3db184c780f5822f231426f508
2019-09-05 11:09:25 -07:00
Elliott Hughes 2e51a1553f Switch to toybox stat on macOS too.
Bug: http://b/139450866
Test: builds
Change-Id: I1a992a63fbf5181a48262901730b8b67661cc259
2019-09-05 10:02:41 -07:00
Xin Li c271afebaa Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Bowgo Tsai ab38d47d5a Merge "Reland: Moving GSI-specific files to system_ext"
am: 2fc007eba5

Change-Id: I2fae8961887e6fa0e9a8d3815e953a6f687fb2a8
2019-09-05 06:00:50 -07:00
Treehugger Robot 2fc007eba5 Merge "Reland: Moving GSI-specific files to system_ext" 2019-09-05 12:45:57 +00:00
Bowgo Tsai ac3c65b7bb Reland: Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Test: rm -rf out && build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug droid
Change-Id: Iae9f5fb688f49497563864eb882d5f0ae33c744a
2019-09-05 17:11:07 +08:00
Ian Kasprzak b5195f128d Merge "Revert "Moving GSI-specific files to system_ext""
am: 414108c6c1

Change-Id: I289dddfc62ee165c9857eace3d703983da32b695
2019-09-04 18:34:31 -07:00
Ian Kasprzak 414108c6c1 Merge "Revert "Moving GSI-specific files to system_ext"" 2019-09-05 01:08:17 +00:00
Ian Kasprzak cba65a9c92 Revert "Moving GSI-specific files to system_ext"
This reverts commit 8ef0ffe7e8.

Reason for revert: b/140499897 - Breaking multiple builds across branches.
Test: Forrest - go/forrest_run/L78500000361846284

Change-Id: I618e0d051fdcd7a7afcc09408e20c53f38566e94
2019-09-05 01:03:17 +00:00
Xin Li 7a05ffb25c DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I3ee2eb0c9eebb865231b7cacdd6d12a34e3586e0
2019-09-04 17:56:34 -07:00
Yifan Hong 708cbdbd41 Merge "releasetools: add dep to checkvintf"
am: fd4a3de77d

Change-Id: Ie5ffcd9b96de64129555980d77d851f7672f2083
2019-09-04 17:53:30 -07:00
Yifan Hong fd4a3de77d Merge "releasetools: add dep to checkvintf" 2019-09-05 00:14:58 +00:00
Yifan Hong 09298552e2 releasetools: add dep to checkvintf
'required' only works on python_binary_host.
Test: modify checkvintf source code, build ota_from_target_files

Change-Id: Ieac68b39b1ccabae679a1679f184cb3aeaaeefb6
2019-09-04 12:37:46 -07:00
Julien Desprez c264c32770 Merge "Delete cts_instant tasks: not needed anymore"
am: 979c9f3117

Change-Id: I83be1baa082283cb85172aa728ccb4a3f566f8f1
2019-09-04 12:04:12 -07:00
Julien Desprez 979c9f3117 Merge "Delete cts_instant tasks: not needed anymore" 2019-09-04 17:39:55 +00:00
Bowgo Tsai 478bda0122 Merge "Moving GSI-specific files to system_ext"
am: a6c80c1117

Change-Id: Ibba7d959d3e8a3e2b97c9138d067f9b6d0593d60
2019-09-04 08:22:42 -07:00
Treehugger Robot a6c80c1117 Merge "Moving GSI-specific files to system_ext" 2019-09-04 13:59:17 +00:00
Bowgo Tsai f14ec6bfc3 Moving emulator-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So emulator-specific things should be moved to /system_ext.

Bug: 137711197
Test: build and checks those properties are in /system_ext/build.prop
Change-Id: I0f8afdeda77849b06842dd4f6cd04b7aab08ada4
2019-09-04 13:18:45 +00:00
Bowgo Tsai 8ef0ffe7e8 Moving GSI-specific files to system_ext
Only common files can reside in system partition, other files
should be moved to the newly added system_ext partition.

Note that for GSI, it will be a single system.img that includes the
contents of product and system_ext partitions, under /system/product
and /system/system_ext, respectively. After moving skip_mount.cfg to
system_ext partition, it also needs a symlink file under system
partition:

  /system/etc/init/config -> /system/system_ext/etc/init/config

This allows Q-launched first-stage init (in /boot partition) continue
to use the same path when new GSI image is used.

Bug: 138281441
Test: build aosp_arm64-userdebug and boot it on crosshatch
Change-Id: Ida7c2d1b0152c7ef77fa9aeb5d0766d17aec59c5
2019-09-04 14:54:53 +08:00
Julien Desprez 7c519defbd Delete cts_instant tasks: not needed anymore
Cts-instant is now run directly from cts so there is no
need for a dedicated (unmaintained) cts-instant target.

Test: None
Bug: 139302375
Change-Id: Ibac30f182028981cc7ad55b3998fbf6a545f62f1
2019-09-03 14:43:41 -07:00
Bo Hu 75e29ad5d4 Merge "goldfish: support system_ext"
am: 9432b4d052

Change-Id: Iad5ff28eab7ac56a038e192c7aa0f5019e3428a2
2019-09-03 10:40:08 -07:00
Bo Hu 9432b4d052 Merge "goldfish: support system_ext" 2019-09-03 17:15:30 +00:00
bohu 11eadcc4ed goldfish: support system_ext
For sdk_phone_* targets only

Change-Id: I4109a923a53311d09bafc2a0f5a70b2af4509cc3
2019-09-03 07:53:27 -07:00
Martin Stjernholm 2722c66be7 Merge changes from topic "art-without-bionic"
am: 1260ce2fb5

Change-Id: I03851bf14865f7e40dc2ce77561833d03d3b70cc
2019-09-02 03:43:45 -07:00
Martin Stjernholm 874894452f Add new ART APEX.
am: 1ebd568850

Change-Id: I6372bef9ffd3e0f50d6c0bd373b8838cffc58b3b
2019-09-02 03:43:33 -07:00
Martin Stjernholm 1260ce2fb5 Merge changes from topic "art-without-bionic"
* changes:
  Update dexpreopt for the ART APEX name change.
  Add new ART APEX.
2019-09-02 10:28:30 +00:00
Yifan Hong 92bad9c73d Merge "Partially Revert "Check VINTF compatibility at OTA generation time.""
am: 66d73717b5

Change-Id: I6629fdc810730ad8db28867d8d9912982cd4f6ff
2019-08-30 17:42:32 -07:00
Yifan Hong 66d73717b5 Merge "Partially Revert "Check VINTF compatibility at OTA generation time."" 2019-08-31 00:22:29 +00:00
Yifan Hong 948b259b52 Partially Revert "Check VINTF compatibility at OTA generation time."
This partially reverts commit 9276cf0226.

Reason for revert: broke mixed build

Put META/{system,vendor}_{manifest,matrix}.xml back because mixed builds
needs this.

Bug: 140217956
Test: mainline builds

Change-Id: I80898a17d6b86b17114b729d905dd9ab10bc927a
2019-08-30 12:54:09 -07:00
Tao Bao bce0264348 Merge "releasetools: img_from_target_files uses zip2zip."
am: f833a75283

Change-Id: I1731934e5585185167db9638c7b6652871fbf913
2019-08-30 12:29:42 -07:00
Tao Bao f833a75283 Merge "releasetools: img_from_target_files uses zip2zip." 2019-08-30 19:13:59 +00:00
Martin Stjernholm 1ebd568850 Add new ART APEX.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Iaf2ba03b4136482f7fc60d464d012014d58216bd
Merged-In: Iaf2ba03b4136482f7fc60d464d012014d58216bd
2019-08-30 17:47:30 +01:00
Martin Stjernholm b324175118 Update dexpreopt for the ART APEX name change.
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
Merged-In: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
2019-08-30 17:47:30 +01:00
Juju Sung dd173ae513 Merge "Remove extra brackets in vndk_packages collecting phase"
am: 8f4f97da3f

Change-Id: Ic9d43bf388799d22395a5cc3c3f9a78cfaf700d5
2019-08-29 23:09:44 -07:00
Treehugger Robot 8f4f97da3f Merge "Remove extra brackets in vndk_packages collecting phase" 2019-08-30 03:53:35 +00:00
Juju Sung 3021218d2a Remove extra brackets in vndk_packages collecting phase
Built target with syntax error near unexpected token `llndk.libraries.txt'
Unpaired brackets makes syntax error in collecting vndk_packages.

Test: build&flashed
Bug: 140097958
Change-Id: I65683a1fc3e7d2f1c8e4eeb471b23620d48c7c41
2019-08-30 09:59:51 +09:00
Tianjie Xu 8b106fd2bc Merge "Add a new flag "--disable_fec_computation" for OTA generation"
am: 9c9993c706

Change-Id: Ic077215542e20c2bc9fbaaaa2fa602f15d3f4a87
2019-08-29 13:27:20 -07:00
Tianjie Xu 9c9993c706 Merge "Add a new flag "--disable_fec_computation" for OTA generation" 2019-08-29 20:05:41 +00:00
Tianjie Xu 1b07983c6d Add a new flag "--disable_fec_computation" for OTA generation
We have added the flag to disable on device fec computation in
brillo_update_payload. Exposed it in ota_from_target_files as well.

Bug: 139723500
Test: generate an incremental package with the new flag
Change-Id: I683e3ec7791963a3c7e141ecb4e5a3fb53fe2108
2019-08-28 21:38:05 -07:00
Yifan Hong ee276acce8 Merge changes from topic "vintf_ota_delete"
am: bcba1cfdaf

Change-Id: If11df7c409b9d1087defc119bf3a132f5b7016c5
2019-08-28 17:21:36 -07:00
Yifan Hong a592de9c61 Check VINTF compatibility at OTA generation time.
am: 9276cf0226

Change-Id: Iee0efa785ccbf2aaadb1be7b3dc106f805242adb
2019-08-28 17:21:27 -07:00
Yifan Hong 96961bf94f releasetools: add tests for check_target_files_vintf
am: ccb86fe7d4

Change-Id: I3ecddd78ccce7f97bd02abea133ad84187b312ac
2019-08-28 17:21:07 -07:00
Yifan Hong d14a6110c5 Add a script to check VINTF compat of target files package.
am: e3ba82cff2

Change-Id: Iccf4b7afa93749f441f48a3270f3d4beac8a0f06
2019-08-28 17:20:52 -07:00
Ivan Lozano a9fef4a0c7 Merge "Make support for rust modules from Soong."
am: e9cb5fa350

Change-Id: I9e109fe46ed9532cc445522a381a9016a86d37f3
2019-08-28 17:07:48 -07:00
Tao Bao 57f8ed6b5e releasetools: img_from_target_files uses zip2zip.
Test: Build the following targets and check the built image archive.
      bonito-userdebug (contains flashable images);
      cf_x86_phone-userdebug (contains super.img);
      aosp_arm64-eng (contains VerifiedBootParams.textproto)
Test: m -j otatools-package; Check that zip2zip is included; Use
      bin/img_from_target_files to generate image archive.
Change-Id: I9f28765bd702849f0df309faebd6aa3072920536
2019-08-28 16:36:25 -07:00
Yifan Hong bcba1cfdaf Merge changes from topic "vintf_ota_delete"
* changes:
  merge_target_files: Checks VINTF metadata of resulting target files
  Check VINTF compatibility at OTA generation time.
  releasetools: add tests for check_target_files_vintf
  Add a script to check VINTF compat of target files package.
2019-08-28 23:19:21 +00:00
Ivan Lozano e9cb5fa350 Merge "Make support for rust modules from Soong." 2019-08-28 22:04:56 +00:00
Yifan Hong 9276cf0226 Check VINTF compatibility at OTA generation time.
Instead of relying on META/{system,vendor}_{manifest,matrix}.xml
and blindly copy compatibility.zip from target files package to
OTA package, do a static check on the input target files package
before generating the OTA package.

META/{system,vendor}_{manifest,matrix} does not contain ODM manifest
fragments, which is incorrect.

Also, the on-device check of compatibility.zip uses a old libvintf
binary on the device, which may not understand the incoming VINTF
metadata. This change removes the on-device check. Hence, it removes
the requirement of forwards compatibility of libvintf.

This behavior can be skipped with --skip-compatibility-check.

Test: build OTA package
Bug: 139300422
Bug: 131425279
Change-Id: I7fb93be9eb73f578fc05a182c6c9d1f073db2800
2019-08-28 11:02:26 -07:00
Yifan Hong ccb86fe7d4 releasetools: add tests for check_target_files_vintf
Test: run it
Bug: 139300422
Change-Id: I265d1e6313177dc661bb5cdf1415b11684dec0a0
2019-08-28 11:02:26 -07:00
Yifan Hong e3ba82cff2 Add a script to check VINTF compat of target files package.
Instead of checking META/{system,vendor}_{manifest,matrix}.xml (which
is error-prone because ODM SKU-specific manifests are not checked),
this script read the target files package, remaps its directory
structure so that checkvintf understands it, and check VINTF
compatibility.

Also, put it in otatools.zip.

Test: run it on an extracted target files package
Bug: 131425279
Change-Id: I06036f9a8d7242d4bc11524028be40e780c508e8
2019-08-28 11:02:26 -07:00