Commit Graph

17912 Commits

Author SHA1 Message Date
Vic Yang 38166bf1d0 Merge changes from topic "vndkvariantcheck"
am: 3fbe62b57d

Change-Id: I8b16aa1041456254fa5539cd5dfbfd1e6f45fa45
2020-01-17 12:28:37 -08:00
Treehugger Robot 3fbe62b57d Merge changes from topic "vndkvariantcheck"
* changes:
  vndkMustUseVendorVariant += libstagefright_bufferpool@2.0
  Emit LOCAL_CHECK_SAME_VNDK_VARIANTS
2020-01-17 18:45:43 +00:00
Automerger Merge Worker 87318085ca Merge "Dedup cc binary build components registration" am: e24093a784
Change-Id: I671227906222038e87f0a94b05f1674bf7ad9e5d
2020-01-17 11:21:11 +00:00
Treehugger Robot e24093a784 Merge "Dedup cc binary build components registration" 2020-01-17 11:11:50 +00:00
Automerger Merge Worker 7f27094930 Merge "Build kzip for Go files in build/blueprint directory." am: 26691c094d
Change-Id: Idf68059fb4e81434eb4c71a6700f168ea0321cbb
2020-01-17 08:08:26 +00:00
Treehugger Robot 26691c094d Merge "Build kzip for Go files in build/blueprint directory." 2020-01-17 07:58:43 +00:00
Dan Willemsen eb5078f0a6 Merge "Fix dependencies through symlinks"
am: d66b2fd3cf

Change-Id: If67c87530e33ce6a939bf7280d0957c4be5d6595
2020-01-16 16:01:11 -08:00
Treehugger Robot d66b2fd3cf Merge "Fix dependencies through symlinks" 2020-01-16 23:21:25 +00:00
Wei Wang 062354f8f5 Merge "power: add stable aidl to VndkMustUseVendorVariantList"
am: 27a5c64200

Change-Id: Iec390e3424df0a15d86644d6c7f25b05e87eddda
2020-01-16 14:39:57 -08:00
Wei Wang 27a5c64200 Merge "power: add stable aidl to VndkMustUseVendorVariantList" 2020-01-16 22:35:42 +00:00
Paul Duffin 121880e321 Merge "Exclude sdkMemberVersionedDepTag from visibility enforcement"
am: 7839d8fbed

Change-Id: Ie7196c2d97c49235e82ed0c8c7c611673b01b8aa
2020-01-16 12:53:23 -08:00
Treehugger Robot 7839d8fbed Merge "Exclude sdkMemberVersionedDepTag from visibility enforcement" 2020-01-16 20:46:16 +00:00
Sasha Smundak facb360e49 Build kzip for Go files in build/blueprint directory.
Bug: 137798757
Test: manual
Change-Id: If953425c80c60a64ebd6d50dddbac858ef091275
2020-01-16 11:02:17 -08:00
Sasha Smundak e0703cdd88 Merge "Save compilation units in protobuf format."
am: 1be2d48005

Change-Id: I43dc0473e06713678731ebe37c715044adf2040d
2020-01-16 10:58:16 -08:00
Treehugger Robot 1be2d48005 Merge "Save compilation units in protobuf format." 2020-01-16 18:55:26 +00:00
Dan Willemsen 40efa1cd31 Fix dependencies through symlinks
Now that ninja uses lstat so that we can get the mtime of the symlink
itself, it's safe to use a real input here rather than an order only
input. This matches how our other install rules work for host files.
Symlinks should be quick to recreate, so I'm not copying the logic to do
order-only dependencies for the device.

Bug: 128577186
Bug: 145278193
Bug: 135515543
Test: m out/target/product/walleye/apex/com.android.art.debug/javalib/arm/boot.art
      rm out/soong/host/linux-x86/bin/dex2oatd64
      m out/target/product/walleye/apex/com.android.art.debug/javalib/arm/boot.art

Change-Id: Ief5ec752ce0d0216aeecd8e904afc59f3f08ed7d
2020-01-16 17:13:35 +00:00
Paul Duffin 2ee6979443 Dedup cc binary build components registration
Bug: 146540677
Test: m nothing

Change-Id: I1c677d0ee2cead1d61f81e34e8d5a2f4a52f6cad
2020-01-16 14:10:18 +00:00
Dario Freni 4f8996aa3d Merge "Include the hashtree in Q-launched modules."
am: 9c121cd7f3

Change-Id: Ie19d36718f1f333f7acbe718fa48e16089e02f57
2020-01-16 05:07:22 -08:00
Anton Hansson cdf31609a0 Default apex_available to //apex_available:platform
am: eec79ebe03

Change-Id: Ieb3d5afa63598e1ad6310f889e233bd119fa292c
2020-01-16 05:02:38 -08:00
Treehugger Robot 9c121cd7f3 Merge "Include the hashtree in Q-launched modules." 2020-01-16 12:27:47 +00:00
Anton Hansson eec79ebe03 Default apex_available to //apex_available:platform
This means everything that goes into apexes need to be
explicitly labeled to be available for apex.

Whitelist the current offenders. This list should be
trimmed down.

Bug: 147364041
Test: m
Test: multiproduct_kati -only-soong
Exempt-From-Owner-Approval: cherry-pick from internal
Change-Id: I837299c6a15d46f8a5ba544b613776b1cc27d7b8
Merged-In: I837299c6a15d46f8a5ba544b613776b1cc27d7b8
(cherry picked from commit 93488cbb10d4882845abb732f8e53714f0982031)
2020-01-16 09:14:03 +00:00
Jiyong Park 4a1ab34f70 Merge "List of installed files for each APEX is dist'ed"
am: 8122cf6d09

Change-Id: Ia5b758178048fc0b431e51af3a5fad3dfda46d14
2020-01-15 23:00:53 -08:00
Treehugger Robot 8122cf6d09 Merge "List of installed files for each APEX is dist'ed" 2020-01-16 06:38:11 +00:00
Paul Duffin 273045701d Merge changes I0668ff5a,Iff2d7063,I6f8b1e2d,I126db49d,Ic6582260
am: a35294889f

Change-Id: Ie7dd47c977104d74b8cb31481524cb22cbc46d18
2020-01-15 18:11:36 -08:00
Treehugger Robot a35294889f Merge changes I0668ff5a,Iff2d7063,I6f8b1e2d,I126db49d,Ic6582260
* changes:
  Exclude source->prebuilt deps from visibility enforcement
  Dedup package build components registration
  Support registering hard coded pre arch mutators
  Added java_system_modules_import
  Document java_system_modules
2020-01-16 02:09:36 +00:00
Paul Duffin d3a2e1e36e Merge "Add basic test for java_system_modules"
am: 0b3a5781a9

Change-Id: I9e8dfadedc65eca652b6085cb076c05e12beacb7
2020-01-15 18:04:47 -08:00
Treehugger Robot 0b3a5781a9 Merge "Add basic test for java_system_modules" 2020-01-16 02:03:44 +00:00
TreeHugger Robot 1c9f0439ae Merge "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 01:43:52 +00:00
bralee 850a13f80c Merge "AIDEGen:fix module_bp_cc_deps.json content error."
am: bb363086c7

Change-Id: Ie810ff61af584daf7c45f41ae595516e0abc60b8
2020-01-15 17:09:06 -08:00
Treehugger Robot bb363086c7 Merge "AIDEGen:fix module_bp_cc_deps.json content error." 2020-01-16 00:20:40 +00:00
Xin Li f04a1dcf8f DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ie5441f31325b0b3156ea731d24f3036d5037aea8
2020-01-15 15:59:08 -08:00
Jaewoong Jung fc81db1149 Merge "Keep signatures of presigned prebuilt test apps."
am: 275eb69d0a

Change-Id: Ibbb1d228e3747fb3f558619b252be42a2a39b03d
2020-01-15 15:19:54 -08:00
Jaewoong Jung 275eb69d0a Merge "Keep signatures of presigned prebuilt test apps." 2020-01-15 23:17:02 +00:00
Sasha Smundak 6c2d4f91f8 Save compilation units in protobuf format.
Bug: 146224091
Test: manual
Change-Id: I7a856bab13f54c78efa0061421c3fcb9341bc6e7
2020-01-15 12:40:03 -08:00
Matthew Maurer 046fda828c Merge changes I828b3e6b,I5d85ea8b
am: 5f5809a098

Change-Id: I9404095b752929514297e8a6f31666e4055ada2d
2020-01-15 12:30:59 -08:00
Matthew Maurer 5f5809a098 Merge changes I828b3e6b,I5d85ea8b
* changes:
  rust: Do not pass -C prefer-dynamic for cdylib
  rust: Include Soong module name as metadata
2020-01-15 20:28:25 +00:00
Dan Willemsen 7e3950624e Merge "Disallow system m4"
am: 0b031cf181

Change-Id: I7f4a795ed3bb65de5aea7e9e4b6f6f56be29c691
2020-01-15 11:41:12 -08:00
Treehugger Robot 0b031cf181 Merge "Disallow system m4" 2020-01-15 19:38:22 +00:00
Matthew Maurer 46c46ccafd rust: Do not pass -C prefer-dynamic for cdylib
cdylib targets cannot currently dynamically link to Rust crates, so this
flag was not actually doing anything, and in conjunction with -C lto
which we *do* want on for this target, causes a hard error on
rustc-1.40.0.

Bug: 147438124
Test: Build a rust_library module, this implicitly tries to build cdylib
Change-Id: I828b3e6bae7c58f4081db3e73009b443a382a296
2020-01-15 08:37:46 -08:00
Matthew Maurer 22cef966e1 rust: Include Soong module name as metadata
If we want to build a component which uses two versions of a crate in
the dependency graph (for example, libc in std and libc from
external/crates), Rust requires at least one of them have a metadata
field to differentiate them.

Since Soong module names should be distinct for a given target, they
should serve as metadata.

Bug: 147397356
Test: Build a rust library with "rlibs: ["liblibc"]" in the blueprint
Change-Id: I5d85ea8b3197972c09de301c9523efaff08adf81
2020-01-15 08:37:42 -08:00
Jaewoong Jung 7c5bd835d0 Keep signatures of presigned prebuilt test apps.
Skip the JNI uncompress step for presigned prebuilt test apps. They
don't need it, and they can invalidate the signature. Also, fix the
install partition of prebuilt test apps.

Fixes: 143472191
Test: app_test.go
Test: Converted CtsShimPrivUpgradePrebuilt to bp and checked the
final output apk signature.

Change-Id: Ied7d3576b5db4de40a9ca9e388336229d07212f5
2020-01-15 14:33:32 +00:00
Paul Duffin fe1492223f Exclude sdkMemberVersionedDepTag from visibility enforcement
The implicit dependency from an unversioned sdk member to the snapshot
versions should be excluded from visibility enforcement as it provides
no benefit and would require snapshot members to be visible to their
original source modules which would complicate visibility handling.

Also, corrects a spelling mistake in sdkMemberVersionedDepTag.

Bug: 142940300
Test: m nothing
Change-Id: Ib7ea6a3d3904d042dca0ea12f6b9196d40de970b
2020-01-15 11:17:57 +00:00
Paul Duffin 78ac5b962e Exclude source->prebuilt deps from visibility enforcement
When both prebuilt and source versions of a module are present in the
build an implicit dependency is added from source -> prebuilt. This
change excludes that dependency from visibility enforcement as it
provides no value and would otherwise require an sdk snapshot to
rewrite the visibility of the generated prebuilt modules which would
be complicated.

The rewriting would include:
* Detecting //visibility:public and just passing that straight through.
* Detecting //visibility:private and replacing that with the location
  of the source.
* Otherwise, adding the location of the source to the visibility
  property.

This adds a general mechanism to allow any dependency to be excluded
from visibility enforcement by simply using a tag that implements
the ExcludeFromVisibilityEnforcementTag interface.

Bug: 142940300
Test: m nothing
Change-Id: I0668ff5aa798152d17faf3aac1bb8eff8d6350c3
2020-01-15 11:17:57 +00:00
Paul Duffin a7b9f42587 Add basic test for java_system_modules
Bug: 142940300
Test: m nothing
Change-Id: I8855df0832f93e40d31e457191590458c274bb5c
2020-01-15 11:17:57 +00:00
Paul Duffin c132742c96 Dedup package build components registration
Bug: 146540677
Test: m nothing
Change-Id: Iff2d7063b7f06313e9068c61a5627229463c98dd
2020-01-15 11:17:57 +00:00
Paul Duffin a80ef84652 Support registering hard coded pre arch mutators
Some pre arch mutators are hard coded into mutator.go and so could not
share code for registering those mutators between tests and runtime.
This change adds a new HardCodedPreArchMutators(RegisterMutatorFunc)
method to RegistrationContext which allows hard coded mutators to be
registered alongside other build components during init() and testing.

The method is treated as a noop on the InitRegistrationContext and
behaves just like the PreArchMutators(RegisterMutatorFunc) method on
the TestingContext.

Bug: 146540677
Test: m nothing
Change-Id: I6f8b1e2d54d9dc4e86f951ced61d1ee7b0fe4b2e
2020-01-15 11:17:57 +00:00
Paul Duffin 90169baf0e Added java_system_modules_import
A prebuilt version of java_system_modules. It does not import the
generated system module, it generates the system module from imported
java libraries in the same way that java_system_modules does. It just
acts as a prebuilt, i.e. can have the same base name as another module
type and the one to use is selected at runtime.

Bug: 142940300
Test: m nothing
Change-Id: I126db49d18294fcd6e2b7ad0237f83e9c2fdef7a
2020-01-15 11:17:57 +00:00
Paul Duffin cded5ecfc3 Document java_system_modules
Bug: 142940300
Test: m nothing
Change-Id: Ic658226088615dbeeef15f17dbb095a968e0742d
2020-01-15 11:17:57 +00:00
Vic Yang 8c38ecba01 vndkMustUseVendorVariant += libstagefright_bufferpool@2.0
Bug: 145157349
Test: Build success
Change-Id: Ic5f1699d034715545c53a8842ef14692f2017706
2020-01-14 22:39:37 -08:00
Jiyong Park 8d050e8e6e Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX""
am: 814bebb8ea

Change-Id: I20352a3728ea7417090e46e8bfa5a8d75dc3ce5c
2020-01-14 22:14:19 -08:00