Commit Graph

13423 Commits

Author SHA1 Message Date
Colin Cross
08a409df2d Reverse merge order of resources and implementation
Merge the resources first in case one of the static libraries
merge into the implementation jars contains a duplicate resource.
Also put the manifest into the resource jar so that the default
manifest doens't override the custom manifest.

Test: m checkbuild
Change-Id: I96d117c306bc9f1346720251d3993031992cef66
2019-04-29 10:29:24 -07:00
Paul Duffin
39610641ca Merge "Add visibility support" am: 77b47fdf51
am: f028b496b6

Change-Id: If85c0b4f117a4d6e6af2d093fbdc2c8fd8bb4f35
2019-04-29 03:30:36 -07:00
Paul Duffin
f028b496b6 Merge "Add visibility support"
am: 77b47fdf51

Change-Id: I7615e1e112408ced5f20600f0a485240767939b8
2019-04-29 03:25:32 -07:00
Paul Duffin
77b47fdf51 Merge "Add visibility support" 2019-04-29 10:10:21 +00:00
Jiyong Park
4d27704da0 Prebuilt APEXes are recoreded in apexkeys.txt
apexkeys.txt now correctly lists prebuilt APEXes with keys specified as
PRESIGNED.

This change also fixes a bug that non-installable APEXes are listed in
the file.

Bug: 131130235
Test: m out/soong/apexkeys.txt and check that
com.android.apex.cts.shim.apex is listed there with PRESIGNED keys.

Merged-In: Ib6d391a82864714743a1cc59cd655bea917b5073
Change-Id: Ib6d391a82864714743a1cc59cd655bea917b5073
(cherry picked from commit a41f12a6fa)
2019-04-29 09:21:23 +09:00
Patrice Arruda
65eb0a42e2 Merge "Soong: Add synopsis to kernel_headers module under cc package." am: f3c5e4816c
am: 58f381b714

Change-Id: I70e8b3a991f31be3358dbc4c89a75ad4b7c7e551
2019-04-26 22:34:29 -07:00
Patrice Arruda
58f381b714 Merge "Soong: Add synopsis to kernel_headers module under cc package."
am: f3c5e4816c

Change-Id: I8512002dde76af8f29d2d355079f375545a58d18
2019-04-26 22:29:30 -07:00
Treehugger Robot
f3c5e4816c Merge "Soong: Add synopsis to kernel_headers module under cc package." 2019-04-27 05:10:15 +00:00
Patrice Arruda
8c8563746c Soong: Add synopsis to ndk_prebuilt_* modules.
Added synopsis to the following modules under cc package:
   * ndk_prebuilt_object
   * ndk_prebuilt_static_stl
   * ndk_prebuilt_shared_stl

Bug: b/128337482
Test: Generated the documentation and verified that the synopsis was
added to each of the module.

Change-Id: Icca7418268a0328b622014da8a077b26800075fd
2019-04-26 18:36:57 -07:00
Colin Cross
07b68c2198 [automerger skipped] Support target.hostdex.required
am: 363360c963 -s ours
am skip reason: change_id I599f3499f0b738556baeb27185371a42b4c2701b with SHA1 7f87f4fdeb is in history

Change-Id: I3ef9488085524011ea0d407fc0b3fd5a4719f7b2
2019-04-26 18:04:12 -07:00
Patrice Arruda
cb5142c2d1 Soong: Add synopsis to kernel_headers module under cc package.
Added kernel_headers synopsis.

Bug: b/128337482
Test: Generated the documentation and verified that the synopsis
      was added to the kernel_headers module.

Change-Id: I3d23fa2408c387883e62dea0742e72a96868ecb4
2019-04-26 15:19:21 -07:00
Colin Cross
62aee6b90a Merge "Tag dex_preopt.profile as a path" am: 3d974ec295
am: 7999578281

Change-Id: I903413a3619cfb9ddb4ed7e99c471b8b690a5336
2019-04-26 14:18:15 -07:00
Colin Cross
7999578281 Merge "Tag dex_preopt.profile as a path"
am: 3d974ec295

Change-Id: Ia38a213edd334e6d5f80aaeaea75d38dde695d08
2019-04-26 14:13:05 -07:00
Treehugger Robot
3d974ec295 Merge "Tag dex_preopt.profile as a path" 2019-04-26 20:50:28 +00:00
Colin Cross
363360c963 Support target.hostdex.required
Hostdex modules sometimes need extra required modules, add
target.hostdex.required.

Bug: 131167818
Test: manual
Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b
Merged-In: I599f3499f0b738556baeb27185371a42b4c2701b
(cherry picked from commit 7f87f4fdeb)
2019-04-26 11:13:30 -07:00
Logan Chien
41eabe63e8 Support opt-in ABI checks
This commit allows a module to opt in for ABI checks even when it is
not an LLNDK/VNDK module.

Bug: 131421213
Test: Add `header_abi_checker { enabled: true, }` to some module
Change-Id: Ie09d262e651cbb44d7d0eba652f55dc1e1e52962
2019-04-27 01:55:50 +08:00
Colin Cross
de4e4e6a6d Tag dex_preopt.profile as a path
Tag dex_preopt.profile with `android:"path"` so that it can be used
with a filegroup.

Test: m checkbuild
Change-Id: I5d6bbfcfcf0a1a22c9478ad57d0c55fb9b9efadd
2019-04-26 10:52:32 -07:00
Paul Duffin
2e61fa6e14 Add visibility support
Implementation uploaded for review. Includes unit tests but does not
yet handle prebuilts, that will come in a future change once some
more general issues with prebuilts and namespaces is resolved.

See README.md#Visibility for details of what this does and how to use
it.

Bug: 112158820
Test: add visibility rules for core library modules, make core-tests
Change-Id: I8ec980554398ad6f2d42043ce518f811a35da679
2019-04-26 12:37:37 +01:00
Colin Cross
24f65fb117 Merge changes Id93bcaea,Ia8f9f910 am: 02cbe8f1c6
am: 52313d976c

Change-Id: Iee615844666c01b225e49bba040eec4c73e970c3
2019-04-25 08:02:43 -07:00
Colin Cross
52313d976c Merge changes Id93bcaea,Ia8f9f910
am: 02cbe8f1c6

Change-Id: I2e238cd5f79d18b8ca44700483215db26f1b564f
2019-04-25 07:58:47 -07:00
Treehugger Robot
02cbe8f1c6 Merge changes Id93bcaea,Ia8f9f910
* changes:
  Pass --remove-tools-declarations to manifest merger
  Don't use merged manifest for android_library modules
2019-04-25 14:47:37 +00:00
Inseob Kim
e902a80b01 Merge "Build contexts files with Soong" am: 18805e483f
am: a5d61d865a

Change-Id: I521a8f9cb48f911b80ed9a595741deca6e13d1e6
2019-04-25 00:57:30 -07:00
Inseob Kim
a5d61d865a Merge "Build contexts files with Soong"
am: 18805e483f

Change-Id: I1f364ac9261d72ee2d97ef388aad3fb02c5e7d9e
2019-04-25 00:52:14 -07:00
Treehugger Robot
18805e483f Merge "Build contexts files with Soong" 2019-04-25 07:46:19 +00:00
Colin Cross
53f0fd2cc3 Merge "Support target.hostdex.required" am: 226586ca3c
am: 02a9b1af2c

Change-Id: Id2ad67edd62f10446e7786241b0518091239ab42
2019-04-24 17:31:15 -07:00
Colin Cross
02a9b1af2c Merge "Support target.hostdex.required"
am: 226586ca3c

Change-Id: I044fa3272c81ffd894be6a59ed7b1d60d6743973
2019-04-24 17:20:24 -07:00
Colin Cross
226586ca3c Merge "Support target.hostdex.required" 2019-04-25 00:06:00 +00:00
Colin Cross
bf88157691 Make java_test_helper_library installable am: 9a4abed701
am: 3109e125b3

Change-Id: I7d587db7e3cd8a4d23e653b7295d62d7a9cdb740
2019-04-24 15:55:03 -07:00
Colin Cross
4d002bafd2 Export proguard_dictionary for java_library modules am: e8a7dc987c
am: 5452d26838

Change-Id: I991eddb63cf66016bcfc3270ee876f0cdfe7cd99
2019-04-24 15:51:55 -07:00
Colin Cross
3109e125b3 Make java_test_helper_library installable
am: 9a4abed701

Change-Id: I082ee7deec7677e9a00b5511ee650dba512c5485
2019-04-24 15:47:48 -07:00
Colin Cross
5452d26838 Export proguard_dictionary for java_library modules
am: e8a7dc987c

Change-Id: I62eb5f457aa2aa8f90f7d46e872f2136e8a39150
2019-04-24 15:45:47 -07:00
Colin Cross
aa1c6f1f5a Pass --remove-tools-declarations to manifest merger
Manifest merger needs --remove-tools-declarations to match
Gradle behavior.

Bug: 112607039
Test: m checkbuild
Change-Id: Id93bcaeaf03770a4acd2e1fdf44e418f55540dd3
2019-04-24 14:41:04 -07:00
Colin Cross
90c25c6893 Don't use merged manifest for android_library modules
Don't use the merged manifest for android_library modules.  We
still have to run manifest merger for android_library modules
because Make can't handle transitive dependencies, so it will
continue to merge the manifests at each library, and then merge
the manifests of direct dependencies into the final application.

Bug: 113294940
Test: m checkbuild
Change-Id: Ia8f9f910bd0a134730ddf2d542460eeddbc0a075
2019-04-24 14:40:14 -07:00
Colin Cross
7f87f4fdeb Support target.hostdex.required
Hostdex modules sometimes need extra required modules, add
target.hostdex.required.

Bug: 131167818
Test: manual
Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b
2019-04-24 20:43:14 +00:00
Colin Cross
9a4abed701 Make java_test_helper_library installable
java_test_helper_library should product an installabler, dexed
library, the same as java_test just without the auto-generated
test config.

Test: m checkbuild
Change-Id: Ie573c1d24969ba9c4feb8a2e85f8969d5d713064
2019-04-24 13:19:28 -07:00
Colin Cross
e8a7dc987c Export proguard_dictionary for java_library modules
Move exporting LOCAL_SOONG_PROGUARD_DICT from AndroidLibrary
to Library so that it is exported for java_library modules.

Test: m checkbuild
Change-Id: I27ea08ad8ba9072d0648c141cdbaf447c5268f91
2019-04-24 12:52:42 -07:00
Colin Cross
4192aa50e9 Export java_host_for_device and java_device_for_host modules to Make am: 28c3eb6829
am: 0872753d91

Change-Id: Ifffaa4dd1d2943deedfb2080d1bc3386c0080eaf
2019-04-24 10:35:17 -07:00
Colin Cross
0872753d91 Export java_host_for_device and java_device_for_host modules to Make
am: 28c3eb6829

Change-Id: I3cbb222c85048b087b10463ec4ae589ba387317e
2019-04-24 10:30:12 -07:00
Colin Cross
28c3eb6829 Export java_host_for_device and java_device_for_host modules to Make
Robolectric needs to reference some modules declared with
java_host_for_device and java_device_for_host from Make for now.

Bug: 122331577
Test: m checkbuild
Change-Id: I09b3848edb120f2c3ee16b449b937b650f59811b
2019-04-24 05:17:22 +00:00
Jiyong Park
ded02fab27 Merge "Prebuilt APEXes are recoreded in apexkeys.txt" into qt-dev
am: a25a2779c6

Change-Id: Ia6f97ecf118b6a74f68ddc6c69ece35ee8fe934d
2019-04-23 21:42:24 -07:00
Colin Cross
9901de43b4 [automerger skipped] Merge "Fix handling optimize.enabled from java_defaults" into qt-dev
am: 687fd94d44 -s ours
am skip reason: change_id Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c with SHA1 2057f82161 is in history

Change-Id: Ic5b7f2af7ae6305a55b6af5dfefc0eb9e08a36f6
2019-04-23 21:06:59 -07:00
TreeHugger Robot
a25a2779c6 Merge "Prebuilt APEXes are recoreded in apexkeys.txt" into qt-dev 2019-04-24 03:46:16 +00:00
Colin Cross
687fd94d44 Merge "Fix handling optimize.enabled from java_defaults" into qt-dev 2019-04-24 03:31:49 +00:00
Jaewoong Jung
f80055138e Merge "New AndroidMk authoring system based on entry map." am: 159a585251
am: 7cf4b87560

Change-Id: I2b9e70d207146ba5a4d2c04489cc680b6f9d0d6f
2019-04-23 09:31:18 -07:00
Jaewoong Jung
7cf4b87560 Merge "New AndroidMk authoring system based on entry map."
am: 159a585251

Change-Id: Iaea12a1314d12e724145dc8c3698390d33e623aa
2019-04-23 09:07:27 -07:00
Jaewoong Jung
159a585251 Merge "New AndroidMk authoring system based on entry map." 2019-04-23 14:43:52 +00:00
Jiyong Park
a41f12a6fa Prebuilt APEXes are recoreded in apexkeys.txt
apexkeys.txt now correctly lists prebuilt APEXes with keys specified as
PRESIGNED.

This change also fixes a bug that non-installable APEXes are listed in
the file.

Bug: 131130235
Test: m out/soong/apexkeys.txt and check that
com.android.apex.cts.shim.apex is listed there with PRESIGNED keys.

Change-Id: Ib6d391a82864714743a1cc59cd655bea917b5073
2019-04-23 18:03:16 +09:00
Jiyong Park
1044ef7d90 [automerger skipped] Merge changes Ic5f467fb,I68d52668 into qt-dev
am: 6decc5d7ff -s ours
am skip reason: change_id Ic5f467fbc2837727df92102530687e967cd5529f with SHA1 d4671111ef is in history

Change-Id: I06ba3afa9d43488afceb1eb71c542b32a3a0717b
2019-04-22 23:39:50 -07:00
Jiyong Park
7a0300d1df [automerger skipped] Set default target SDK version for APEX
am: d37a882ad4 -s ours
am skip reason: change_id I086230d787f01075c28fc3f0163550300fa00212 with SHA1 71b519d6ce is in history

Change-Id: I654ce369c3fb952d97647e630476d603ba6fd1dc
2019-04-22 23:38:56 -07:00
TreeHugger Robot
6decc5d7ff Merge changes Ic5f467fb,I68d52668 into qt-dev
* changes:
  Ensure that PathsForModuleSrc works with prebuilts
  Fix: PathsForModuleSrc does not work for a replaced dependency
2019-04-23 06:24:22 +00:00