Commit graph

21551 commits

Author SHA1 Message Date
Treehugger Robot
1623ec97f1 Merge "add vendor_boot image support" 2019-09-27 21:07:24 +00:00
Steve Muckle
e1b1086ef3 add vendor_boot image support
The vendor_boot partition is generated by mkbootimg and contains all the
device-specific information that used to reside in the boot partition.

Bug: 137297791
Change-Id: I5b005097b73f59857c3a2f92d693b3e67ee8424e
2019-09-27 10:26:00 -07:00
Treehugger Robot
90c7163e7e Merge "cleanup: remove unused variable" 2019-09-26 16:42:41 +00:00
Jooyung Han
f251232bb1 cleanup: remove unused variable
removing an unused variable: vndk_snapshot_configs_out in
core/tasks/vndk.mk

Test: m vndk
Change-Id: I2dc76ec7e41c8b1e818ecd056526a8c61a18da92
2019-09-25 10:33:58 +09:00
Anton Hansson
ee07ef0019 Improve error message for artifacts outside requirement
Print the allowed paths as part of the error message.

Test: m
Change-Id: Ieb6303f39260ce83232b1c9a0a30e8cac76e2c9c
2019-09-24 12:40:25 +01:00
Treehugger Robot
30648c3a21 Merge "Fix to avoid breaking aosp_x86 build" 2019-09-20 22:48:10 +00:00
hamzeh
53cedb0653 Fix to avoid breaking aosp_x86 build
Removing this section as per suggetion in comment#6 (b/139694329)

Bug: 139694329
Test: none
Change-Id: I51b0ab17aeff5897932203773bd02a4951268a73
2019-09-20 12:43:02 -07:00
Dan Shi
d9bef81f7c Merge "Create a vts-core suite harness package" 2019-09-20 18:06:19 +00:00
Daniel Mentz
8bfd896e3d Merge "Don't package mke2fs.conf in otatools.zip" 2019-09-20 17:12:12 +00:00
Dan Shi
796ff4ffb5 Create a vts-core suite harness package
vts-core.zip will include all vts-core tests and suite harness
(vts-core-tradefed).

Bug: 141012181
Test: m -j vts-core

Change-Id: Ib13a2bffb4dc9619d2732d65729ecb0246a0b9a0
2019-09-19 13:13:44 -07:00
Treehugger Robot
30e613a48d Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." 2019-09-19 13:51:17 +00:00
Mitch Phillips
fd6d9022fe Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict.
Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated
by the cc_fuzz target.

Bug: 141026328
Test: m example_fuzzer, fuzz target should have adjacent corpus/dict
files.

Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c
2019-09-18 18:58:28 -07:00
Daniel Mentz
f846914c9f Don't package mke2fs.conf in otatools.zip
mke2fs.conf is now packaged into the Python executable mkuserimg_mke2fs
and no longer needs to be packaged directly into otatools.zip.

Change-Id: I06216ccd60f834747f9302e30397a7f0bae53726
2019-09-18 18:24:41 -07:00
Treehugger Robot
bd496d27ad Merge "Remove TARGET_TRANSLATE_2ND_ARCH" 2019-09-18 20:47:43 +00:00
Colin Cross
02b50d12be Remove TARGET_TRANSLATE_2ND_ARCH
TARGET_TRANSLATE_2ND_ARCH is never set to true any more,
TARGET_NATIVE_BRIDGE_ARCH := arm is always used instead.

Bug: 141242600
Test: m checkbuild
Change-Id: Id3e0614a1d8a088d37929655b74fecd812606db2
2019-09-18 16:23:04 +00:00
Logan Chien
e34b4dea34 Merge "Add check-elf-files as a checkbuild prerequisite" 2019-09-17 18:08:31 +00:00
Jaewoong Jung
9f2e68009d Merge "Revert "Build: Fix test data no present in test suite zip files."" 2019-09-17 14:00:45 +00:00
Jaewoong Jung
5ea6971a1d Revert "Build: Fix test data no present in test suite zip files."
This reverts commit 068d101077.

Reason for revert: Caused a regression

Test: Added data to a sh_test and compared before vs after
Fixes: 140761783
Change-Id: Ied6427cb2dc3093fb88632eb8f337c2b76e86b95
2019-09-13 19:06:30 +00:00
Logan Chien
37e237aa71 Add check-elf-files as a checkbuild prerequisite
This commit adds `check-elf-files` as a `checkbuild` prerequisite so
that prebuilt ELF files can be checked in a `checkbuild` build bot when
`PRODUCT_CHECK_ELF_FILES` is set to `true`.

Bug: 140908693
Test: lunch aosp_walleye-userdebug && make checkbuild
Change-Id: Ifea2f7057eecbf74028e986367f2322ff851f5e4
2019-09-12 21:26:09 -07:00
Elliott Hughes
648017c2b8 Remove macOS special cases pertaining to date(1).
Bug: http://b/139450866
Test: builds
Change-Id: Idc6cc19cf1b81b51526a7d2ba78020c6decb0031
2019-09-12 15:04:16 -07:00
Colin Cross
64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Bowgo Tsai
06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
Colin Cross
d30a949547 Merge "Use more variables from Soong" 2019-09-09 17:21:44 +00:00
Yi Kong
8206233e51 Merge "Add back the llvm-ar P flag" 2019-09-07 03:41:42 +00:00
Yi Kong
6c5e504c26 Add back the llvm-ar P flag
The P flag is supported as of llvm r354044, add back the flag to reduce
the size of intermediate archieve files. This does not affect the final
binaries.

Test: build
Bug: 71618641
Change-Id: I4021aec783ba341768893392b73b976c1fa5bdf7
2019-09-06 15:19:59 -07:00
Elliott Hughes
6b5481fa5e Merge "Remove unused $MD5SUM." 2019-09-06 21:39:15 +00:00
Elliott Hughes
5602110d73 Remove unused $MD5SUM.
Test: treehugger
Change-Id: I63273b1602362a84beaf32d2260a0a4e35e6ef4d
2019-09-06 11:02:08 -07:00
Treehugger Robot
c2ecd76a0b Merge "Dist proguard dictionaries for platform builds" 2019-09-06 15:53:19 +00:00
Colin Cross
114e8dfa3e Dist proguard dictionaries for platform builds
Proguard dictionaries are useful for platform builds as well as
unbundled builds, produce them for both.

Bug: 140585949
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/${TARGET_PRODUCT}-proguard-dict-eng.ccross.zip
Change-Id: I63b826be35cfbfc9661b5be7de5bea285bd3d3fc
2019-09-05 21:08:38 -07:00
Colin Cross
70bfe07e6c Support injecting boringssl hash in Make
Add LOCAL_INJECT_BSSL_HASH for the two modules in Make that
statically link libcrypto.

Bug: 137267623
Test: m checkbuild
Change-Id: I5d21c262ff388aeb2dbd02595706c5531a628b7e
2019-09-05 15:31:31 -07:00
Colin Cross
7a9acce4ec Keep proguard fields for lite runtime
The lite proto runtime uses reflection to access fields based on the names in
the schema, keep all the fields.

Bug: 117607748
Bug: 140062984
Test: m checkbuild
Change-Id: I39bc7d28f619dd2ccaee603e4d407aa7ad33f534
Merged-In: I39bc7d28f619dd2ccaee603e4d407aa7ad33f534
2019-09-05 14:42:14 -07:00
Colin Cross
521d4454fa Make javanano a plugin
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javanano as a plugin by
explicitly passing the path to protoc-gen-javanano.  This allows
removing the javanano customizations from the core plugin code,
which no longer supports javanano natively.

Bug: 117607748
Test: m checkbuild
Change-Id: I913d798136fbee9bfaabe1d815b80c85025cb9b9
Merged-In: I913d798136fbee9bfaabe1d815b80c85025cb9b9
2019-09-05 14:42:14 -07:00
Elliott Hughes
fdef43d69c Merge "Switch to toybox stat on macOS too." 2019-09-05 21:02:06 +00: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
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
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
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
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
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
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
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
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
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