Commit graph

16778 commits

Author SHA1 Message Date
Kyeongkab.Nam
d9bfc18600 Merge "Fix incorrect install path for priv-app prebuilt"
am: a75606be1e

Change-Id: I527272dcd327a6d7f6fbc458d9f123809841356a
2019-11-27 02:07:25 -08:00
Treehugger Robot
a75606be1e Merge "Fix incorrect install path for priv-app prebuilt" 2019-11-27 09:20:15 +00:00
Jooyung Han
9909337ff8 Merge "Fix: install flattened apex on system_ext"
am: 6aa363b7ae

Change-Id: I0c406d4248f147c2e7184514732f4d605135b335
2019-11-26 23:37:57 -08:00
Jooyung Han
6aa363b7ae Merge "Fix: install flattened apex on system_ext" 2019-11-27 07:30:54 +00:00
Jooyung Han
91df2084ad Fix: install flattened apex on system_ext
This build rule is specific to platform APEXes.
For non-platform APEXes, MakeAsSystemExt() is not applied.

This fixes the cases of "soc_specific: true" apexes which fails to
build.

Bug: 139053989
Test: m nothing (soong tests)
Change-Id: I98d0257499647ab41cdaa62a3671d89addbdf833
Exempt-From-Owner-Approval: got +1 before rebasing
2019-11-27 07:30:37 +00:00
Paul Duffin
65b8669b7d Merge "Check the contents of an SDK snapshot's generated Android.bp"
am: 42775ba0bc

Change-Id: I19d9a73dd802bbfe18a28d701e3f6318e84991fd
2019-11-26 23:10:49 -08:00
Treehugger Robot
42775ba0bc Merge "Check the contents of an SDK snapshot's generated Android.bp" 2019-11-27 07:00:58 +00:00
Artur Satayev
bedffa880d Merge "Add exported_plugins to java.Library."
am: 4a692427f7

Change-Id: I44591bbce6d18ff43bbf6ddac9cbcb528b865529
2019-11-26 17:00:45 -08:00
Treehugger Robot
4a692427f7 Merge "Add exported_plugins to java.Library." 2019-11-27 00:52:46 +00:00
Paul Duffin
ac37c503e0 Check the contents of an SDK snapshot's generated Android.bp
Test: m nothing
Bug: 143678475
Change-Id: I407d83c79d6b1ad8082e560726f0bfa7cacab3f0
2019-11-26 22:30:19 +00:00
Dan Shi
36c77ad20b Merge "Clean vts-core in host/out to ensure old package to be removed."
am: 0375dd9a37

Change-Id: Ie88574ba324aa5f63b9daeab6bd754b5194579ce
2019-11-26 13:30:40 -08:00
Treehugger Robot
0375dd9a37 Merge "Clean vts-core in host/out to ensure old package to be removed." 2019-11-26 21:18:28 +00:00
Artur Satayev
9cf4669bc4 Add exported_plugins to java.Library.
The behaviour is similar to go/be#java_library.exported_plugins. Plugins added to exported_plugins of library X are not applied to the library itself, but rather to libraries that directly depend on the library X.

Test: m checkbuild
Bug: 139740873
Change-Id: I4042bd482ad9cb12d6fbaac51f039d38b1b7a428
2019-11-26 19:05:26 +00:00
Dan Shi
53f1a190ff Clean vts-core in host/out to ensure old package to be removed.
Bug: None
Test: m installclean
Change-Id: I5aa451d87dc377e62dcf1b88baa58539fa661feb
2019-11-26 10:02:53 -08:00
Paul Duffin
6cfc927ed6 Generate unversioned cc_prebuilt_library_shared
am: 9010250a16

Change-Id: Iab2116d647d705af237b973410282688d5610d11
2019-11-26 09:42:54 -08:00
Paul Duffin
82b6fe6f2c Dedup code for generating java_import in snapshot
am: 50e7900744

Change-Id: I825c4e219f37a0e55a3cc5b3b9f0fdccf1f8af01
2019-11-26 09:42:52 -08:00
Paul Duffin
9010250a16 Generate unversioned cc_prebuilt_library_shared
Without this the generated snapshot build file will not load.

Bug: 143678475
Test: m nothing and check output for dummy sdk
Change-Id: I252ed01280aeceb4ff40b2d9de2bc2bf88858ea9
2019-11-26 16:19:36 +00:00
Paul Duffin
50e7900744 Dedup code for generating java_import in snapshot
Removes duplicated code for generating a versioned and non-versioned
form of the java_import module in the snapshot.

Bug: 143678475
Test: m nothing and check output for dummy sdk
Change-Id: Ia8d05c3bf9ef79953a817b168dd9d59f2af2d2ce
2019-11-26 16:19:36 +00:00
Ulyana Trafimovich
a5bad9e22e Merge "Revert "Do not dexpreopt system server jars from updatable modules.""
am: 9d8dab57a5

Change-Id: Ib308c8e601dee141ab604bfcc1abc37504391deb
2019-11-26 05:19:56 -08:00
Ulyana Trafimovich
9d8dab57a5 Merge "Revert "Do not dexpreopt system server jars from updatable modules."" 2019-11-26 13:07:48 +00:00
Ulyana Trafimovich
01f6b0a656 Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 61c325ebcc.

Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes).

Exempt-From-Owner-Approval: revert.

Change-Id: I88ddd3af3a6c4ffdaa1fbb881d965356c5c75ad3
2019-11-26 13:06:38 +00:00
Ulyana Trafimovich
fd88a29801 Merge "Do not dexpreopt system server jars from updatable modules."
am: 40227e55be

Change-Id: Ia868bd633a8a2bee15982c15c468e7f9662476bd
2019-11-26 02:26:35 -08:00
Ulyana Trafimovich
40227e55be Merge "Do not dexpreopt system server jars from updatable modules." 2019-11-26 10:18:02 +00:00
Steven Moreland
3443e7df09 Merge "vndkMustUseVendorVariantList += vintf-vibrator"
am: 16fc49db61

Change-Id: I5d7a0e775d39b206091c375c5517bbd33f8e7f74
2019-11-25 15:45:27 -08:00
Steven Moreland
16fc49db61 Merge "vndkMustUseVendorVariantList += vintf-vibrator" 2019-11-25 23:42:48 +00:00
Steven Moreland
e7b5b72015 vndkMustUseVendorVariantList += vintf-vibrator
TARGET_VNDK_USE_CORE_VARIANT devices explicitly track libs which are
differentiated between system/vendor. b/145157349 is filed to try to
catch these errors during normal builds (or in presubmit).

aidl libs need to be differentiated because they explicitly set
different system/vendor stabilities.

Fixes: 145154788
Test: fixes build
Change-Id: I682ceaa2dd23f0f80ba060ae262d766b1367187e
2019-11-25 15:21:44 -08:00
Colin Cross
dc5ae0ee6a Merge changes I0dcc9c7b,I9bc40642
am: 09ef474b6f

Change-Id: I70b1681c2af4d520eb70e80c02cbd00ccf2c3dc8
2019-11-25 14:42:19 -08:00
Colin Cross
09ef474b6f Merge changes I0dcc9c7b,I9bc40642
* changes:
  Move cc.imageMutator into the android package
  Make CreateVariations return []android.Module
2019-11-25 22:30:17 +00:00
Colin Cross
89169a36dd Make TestContext.RegisterModuleType take an android.ModuleFactory
am: 4b49b768a2

Change-Id: Ifdfcdcc3cbf58713bc16fa3f55dd5e2afe0e5943
2019-11-25 14:22:02 -08:00
Colin Cross
4b49b768a2 Make TestContext.RegisterModuleType take an android.ModuleFactory
Avoid having to pass ModuleFactoryAdaptor to every call to
RegisterModuleType in a test by wrapping RegisterModuleType.

Test: all soong tests
Change-Id: If8847d16487de0479cc3020b728256922b3cadba
2019-11-25 10:59:44 -08:00
Paul Duffin
1a88e1d863 Merge changes Ie274263a,I45993324
am: 62835fd85f

Change-Id: I60afce9c11ae2044be192eb3aa292d3ed3622c5c
2019-11-25 09:41:06 -08:00
Paul Duffin
62835fd85f Merge changes Ie274263a,I45993324
* changes:
  Adds droidstubs support to sdk module
  Simplify building an SDK snapshot from the command line
2019-11-25 17:32:53 +00:00
Ulya Trafimovich
61c325ebcc Do not dexpreopt system server jars from updatable modules.
Test: m

Test: The list of updatable system server jars is empty now,
  so I tested that the filer works with a manual experiment:
  - temporarily add ethernet-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
  - m nothing
  - fgrep -e 'ethernet-service' $ANDROID_BUILD_TOP/out/soong/build.ninja | grep dexpreopt
  - expect empty output (no dexpreopt command is generated)

Change-Id: I0b231e823d5a5a97632daa2b5eb7be3e06782004
2019-11-25 16:36:57 +00:00
Jaewoong Jung
492c2d1ba7 Fix Make modules name conflict for override_apex
am: 1670ca0d8b

Change-Id: I54ee55ddfdbcfd9bbfd598e0930d135c671b2973
2019-11-24 07:17:05 -08:00
Jaewoong Jung
1670ca0d8b Fix Make modules name conflict for override_apex
When an override_apex named Foo overrides an apex module named Bar, the
Make modules from Foo have Foo as their suffix. Previously the suffix
was Bar for both of the overriding and the overridden APEXes, causing
name conflicts in the Make side.

Bug: 144338929
Test: apex_test.go
Change-Id: I1396910ab294ba5f5e0585af6d37f1eab9460250
2019-11-23 16:20:50 +09:00
Jooyung Han
d72d91c87f Merge "Make 'file_contexts' prop as android:"path""
am: 9d78c66ac3

Change-Id: I145d4acb0809aaf775e33977d28c7e3a5982c065
2019-11-22 19:45:05 -08:00
Jooyung Han
9d78c66ac3 Merge "Make 'file_contexts' prop as android:"path"" 2019-11-23 03:37:33 +00:00
Roshan Pius
168c17e1e0 Merge "soong: Support system_server jars from apexes"
am: ac25dd3cb2

Change-Id: I062de456bd839a8c019353e15861796af41ecc25
2019-11-22 19:15:42 -08:00
Roshan Pius
ac25dd3cb2 Merge "soong: Support system_server jars from apexes" 2019-11-23 03:09:35 +00:00
Colin Cross
7de9de871c Merge "Add GlobWithDeps to MakeVarsContext"
am: 3ea15b5a72

Change-Id: Ia5fd8513ec766fc936e9329ee25dc8da05ea0b88
2019-11-22 16:40:25 -08:00
Colin Cross
3ea15b5a72 Merge "Add GlobWithDeps to MakeVarsContext" 2019-11-23 00:29:12 +00:00
Roland Levillain
43fb1ffd94 Merge "Fix a typo in a comment in android/module.go."
am: 3351b33595

Change-Id: Ic85197ec7234fb532dbe06bbcfd78926e7ad8729
2019-11-22 13:48:00 -08:00
Roland Levillain
3351b33595 Merge "Fix a typo in a comment in android/module.go." 2019-11-22 21:13:43 +00:00
Paul Duffin
9154718303 Adds droidstubs support to sdk module
Adds stubs_sources property to sdk and unzips the droidstubs srcjar
into the snapshot directory.

Adds an UnzipToSnapshot method to the SnapshotBuilder which creates
a rule that uses zip2zip to repackage the supplied zip content into a
temporary zip file that matches what the required snapshot structure.
e.g. if the supplied zip contains foo/Foo.java and that needs to be in
the snapshot directory java/foo/stubs then it will create a zip that
contains java/foo/stubs/foo/Foo.java.

The temporary zip that is the output of that rule is added to the
zipsToMerge field for merging later.

If the zipsToMerge is empty then the snapshot zip is created as
before. Otherwise, a temporary zip file is created. That is then
merged with the other zip files in zipsToMerge to create the final
snapshot zip.

Adds prebuilt_stubs_sources for use by the generated .bp module.

Bug: 143678475
Test: added conscrypt sdk module and attempted to build it
Change-Id: Ie274263af3a08e36a73c61c0dbf0c341fd6967e2
2019-11-22 20:52:59 +00:00
Roshan Pius
9b51a4078a soong: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib.

Bug: 144722612
Bug: 141785760
Test: Compiles
Change-Id: Ia40bb91d2e05b2601a52eac28a985fe2d8da3481
2019-11-22 12:47:11 -08:00
Colin Cross
2d42ef51d2 Merge "Make fuzz rules reproducible"
am: 87847f7280

Change-Id: I9c12e9f0a3a12f0ea8f2847a7dfd9f2948ba95aa
2019-11-22 12:03:08 -08:00
Treehugger Robot
87847f7280 Merge "Make fuzz rules reproducible" 2019-11-22 19:09:42 +00:00
Paul Duffin
504b46160f Simplify building an SDK snapshot from the command line
Adds a phony target for each sdk module that builds the snapshot zip.

Test: built an sdk module from command line and checked the zip was created.
Bug: 143678475
Change-Id: I4599332443b8da9adea0a16f00f569ffbd421602
2019-11-22 14:52:29 +00:00
Roland Levillain
97c1f34067 Fix a typo in a comment in android/module.go.
Test: m
Change-Id: I1ea4e3ba70fc5f9e919495442ff94ab1e3b1fce2
2019-11-22 14:20:54 +00:00
Kyeongkab.Nam
c49971469f Fix incorrect install path for priv-app prebuilt
Dexpreopted files for privleged app prebuilt(android_app_import) are
installed wrongly to /system/app.
To fix this issue, install path is changed to /system/priv-app
in the case that "privileged" flag is true.

Bug: 144945646
Test: build and check dexpreopted files of privileged app are
      installed to /system/priv-app

Change-Id: Iec140119f58179a3eb0feeff7af2699fcc855fe7
2019-11-22 13:36:21 +09:00