Commit Graph

21519 Commits

Author SHA1 Message Date
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
Ramy Medhat
bc2aa08ca5 Merge "Add PWD to environment variable whitelist for RBE builds."
am: 61fae1ac20

Change-Id: I31125dd51cb0e1d3ad43a7fcb76c7108538ed71d
2019-08-27 19:11:53 -07:00
Ramy Medhat
61fae1ac20 Merge "Add PWD to environment variable whitelist for RBE builds." 2019-08-28 01:58:08 +00:00
Dan Willemsen
bd49363d31 Merge "More base_rules.mk optimizations"
am: 07c9ac0e2a

Change-Id: I334b1a30f101c136c4d9deea0799379250b584c5
2019-08-27 17:13:48 -07:00
Ramy Medhat
e8de0931a1 Add PWD to environment variable whitelist for RBE builds.
Test: Build aosp with USE_RBE=1.

Change-Id: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
2019-08-27 23:50:31 +00:00
Dan Shi
a736d4770f Merge "Instrumentation test doesn't support extra config"
am: a5c6c13623

Change-Id: I1744e945b7e2e106c4e11198c38f0dc2190c3055
2019-08-27 16:47:13 -07:00
Dan Willemsen
07c9ac0e2a Merge "More base_rules.mk optimizations" 2019-08-27 23:42:24 +00:00
Dan Shi
a5c6c13623 Merge "Instrumentation test doesn't support extra config" 2019-08-27 23:12:23 +00:00
Ivan Lozano
d62e7123d8 Make support for rust modules from Soong.
Support for rust modules built in Soong.

Bug: 136189233
Test: Test module builds.
Test: crosvm builds.
Change-Id: Idf2e4a4f760cbcee1d35fe6567ef8e12d4855094
2019-08-27 11:23:35 -07:00
Dan Willemsen
6b86383c9a Merge "Improve performance (don't filter ALL_MODULES)"
am: 6cd7a09718

Change-Id: I8a6d284de11b92b557aae3b090fd012770bf7987
2019-08-27 10:24:02 -07:00
Treehugger Robot
6cd7a09718 Merge "Improve performance (don't filter ALL_MODULES)" 2019-08-27 17:02:15 +00:00
Tom Cherry
080e34e5ec Merge "Remove setting _USING_LIBCXX"
am: 04eacb384b

Change-Id: Ief1732b45ab57c839bc90f11419336dd608e509f
2019-08-27 08:18:32 -07:00
Tom Cherry
04eacb384b Merge "Remove setting _USING_LIBCXX" 2019-08-27 15:10:27 +00:00
Tom Cherry
3c7212fdfb Merge "Fix host-init-verifier regression"
am: 8c116d8616

Change-Id: I5c8c4126071d2470f98ded240a8d09fcd3244e21
2019-08-27 07:53:20 -07:00
Tom Cherry
8c116d8616 Merge "Fix host-init-verifier regression" 2019-08-27 14:39:07 +00:00
Dan Willemsen
30fb5cdce9 Merge "Skip much of aux_config.mk"
am: d052fd3bdc

Change-Id: I75affb9b394859fae85e10bf2210e5246834aebe
2019-08-27 01:20:25 -07:00
Dan Willemsen
46a88893b1 More base_rules.mk optimizations
This saves another 5-15% of makefile eval time (depending on
target/branch).

I'm not sure if deps-license is still used at all, but we'll only save
the information for it if it's actually going to run now.

Since the default module tag is "optional", we really don't need to save
a list of most modules in another variable. I don't see anything that
really needs to see the list of optional modules.

Test: treehugger
Change-Id: Iaf54e9932fbe8e61f10bd0c9336fc4fdefea27ab
2019-08-27 00:49:31 -07:00
Dan Willemsen
2abf159f9b Improve performance (don't filter ALL_MODULES)
It turns out that this single line was responsible for 28-44% of the
time we spent parsing makefiles. So instead of filtering across
$(ALL_MODULES), check to see if a variable that we always would set is
set.

Test: treehugger
Test: check kati-build eval time before/after
Change-Id: I946c2efd060181a4ae9edd3409c53d9b49a58285
2019-08-26 23:25:17 -07:00
Dan Willemsen
9de012ebde Skip much of aux_config.mk
This was showing up in the top-ten longest makefiles during the product
config and cleanspec kati runs sometimes, even though it's really never
used. So instead of running the sometimes-expensive find command, skip it
unless an AUX OS was specified.

At some point we should remove this entirely, but that's a larger change
that doesn't need to happen yet.

Test: build-aosp_arm.ninja is the same before/after
Change-Id: I0ea10193d2f07e1717224e9020a7defaf6191c05
2019-08-26 22:03:32 -07:00
Dan Shi
00d4b4bcc4 Instrumentation test doesn't support extra config
Bug: none
Test: m -j FrameworksCorePackageManagerTests
confirm FrameworksCorePackageManagerTests.config doesn't have the
placeholder.

Change-Id: Ie16720fcf74490fddd1e282f8526e7161d6d10ce
2019-08-26 15:50:15 -07:00
TreeHugger Robot
3db69e3a80 Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master 2019-08-24 06:48:48 +00:00
Elliott Hughes
21e1dba28b Merge "macOS calls itself Darwin."
am: 33dfa52cdd

Change-Id: Ia00d0001106daaecf6b3a4b9b377c1663fd31bd9
2019-08-23 10:10:12 -07:00
Treehugger Robot
33dfa52cdd Merge "macOS calls itself Darwin." 2019-08-23 16:45:07 +00:00
Isaac Chen
5c40e0b628 Merge "Include misc_info.txt for super.img in dist"
am: da8bf47e68

Change-Id: I2982e396ffbf01c5cbed949773a68afa2b65c090
2019-08-23 00:58:36 -07:00
Isaac Chen
da8bf47e68 Merge "Include misc_info.txt for super.img in dist" 2019-08-23 07:35:52 +00:00
Xin Li
8bd576e201 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: If694d0bc707fe5b9d21f9de1b5846ab9f2096042
2019-08-23 06:48:52 +00:00
Elliott Hughes
a8368efe51 macOS calls itself Darwin.
Test: uname
Change-Id: Id3ce8614869e68c15666051af14321f597d6ae0f
2019-08-22 13:38:28 -07:00
Tom Cherry
6215e436f3 Fix host-init-verifier regression
After the split up of prebuilt_internal.mk, the logic for running
host-init-verifier on init.rc files was misplaced.  This change moves
it back to the right location.

Test: see that a mistake in rootdir/init.rc causes the build to fail
Change-Id: I60e503cc48639f4f11c47e6636f140672fde61b4
2019-08-22 10:47:16 -07:00
Dan Willemsen
86be07669f Merge "Remove package-stats.txt"
am: 1211130c92

Change-Id: I6be259692a3a25934f30595b7f23177c4f6b62bb
2019-08-21 23:51:21 -07:00
Treehugger Robot
1211130c92 Merge "Remove package-stats.txt" 2019-08-22 06:40:11 +00:00
Isaac Chen
52cc60ca15 Include misc_info.txt for super.img in dist
Include the misc_info.txt in "dist_files" so we can recreate a new
mixed super image (system and vendor images from different builds)
later in the test pipeline.

The misc_info.txt for products with BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
set to true is removed from their update packages (essentially, reverts
aosp/976069) since the super_misc_info.txt created here can be used.

Bug: 139404128
Test: $ lunch aosp_x86-userdebug
      $ m dist
      $ diff $OUT_DIR/dist/super_misc_info.txt $OUT/misc_info.txt

Change-Id: Iad1ff981124a19933b0b575bc99941e0fc3813a7
2019-08-22 13:22:06 +08:00
Jeongik Cha
5f1eca2482 Merge "SYSTEM_EXT supports executables"
am: 6d52157f9d

Change-Id: I895dec8ff661e914fe35bc20e6a1ab1762037f9b
2019-08-21 18:31:10 -07:00