Commit Graph

11913 Commits

Author SHA1 Message Date
Jiyong Park 004e8d00fe Merge "Static variant of a stubs lib is correctly tracked" am: eebdf43337 am: d563bc7b92
am: 5c16c31be5

Change-Id: I4ce6595041cf9f57ae01235b51b90f018010977d
2019-02-08 21:16:08 -08:00
Jiyong Park 5c16c31be5 Merge "Static variant of a stubs lib is correctly tracked" am: eebdf43337
am: d563bc7b92

Change-Id: I26d23ed0e19fc0ca40c28c70a14deab2ed0ea044
2019-02-08 21:12:05 -08:00
Jiyong Park d563bc7b92 Merge "Static variant of a stubs lib is correctly tracked"
am: eebdf43337

Change-Id: I431341b18a2601b25fa459c0fb108ce9ae36b860
2019-02-08 21:08:03 -08:00
Treehugger Robot eebdf43337 Merge "Static variant of a stubs lib is correctly tracked" 2019-02-09 04:56:07 +00:00
Mikhail Naganov 262659146d Merge "Docs: update path to soong_build.html" am: 2851b8dad5 am: 15aed6fdd4
am: e498903dcf

Change-Id: I4bc8045f02af17a10c61cec61bab5351440023ef
2019-02-08 20:52:06 -08:00
Mikhail Naganov e498903dcf Merge "Docs: update path to soong_build.html" am: 2851b8dad5
am: 15aed6fdd4

Change-Id: I0129d94766cb0c4b3f612e0338dbfeabefc12760
2019-02-08 20:38:59 -08:00
Mikhail Naganov 15aed6fdd4 Merge "Docs: update path to soong_build.html"
am: 2851b8dad5

Change-Id: I58bd3e30cbd87c0e981e3d47448d9a791ba72157
2019-02-08 20:30:57 -08:00
Treehugger Robot 2851b8dad5 Merge "Docs: update path to soong_build.html" 2019-02-09 04:24:27 +00:00
Colin Cross f535d249d8 Merge "Make manifest and APK agree on uncompressed native libs" am: 53d312637f am: d33cdc21bb
am: 7ea16f4cdf

Change-Id: I0a90e565c358ceb5eabb97e104176461dfef3171
2019-02-08 18:55:38 -08:00
Colin Cross 7ea16f4cdf Merge "Make manifest and APK agree on uncompressed native libs" am: 53d312637f
am: d33cdc21bb

Change-Id: I792cf863538e814024c94e8a39e34532bd4d4a2c
2019-02-08 18:47:22 -08:00
Colin Cross d33cdc21bb Merge "Make manifest and APK agree on uncompressed native libs"
am: 53d312637f

Change-Id: If4edb02e8b531d08029f5412eb1bd5759d80dd52
2019-02-08 18:37:42 -08:00
Treehugger Robot 53d312637f Merge "Make manifest and APK agree on uncompressed native libs" 2019-02-09 02:25:32 +00:00
Mikhail Naganov 1c38cdca01 Improve error messages about paths am: ab1f518fb0 am: 33b67a24e6
am: 1c00aec7d0

Change-Id: Ia18bd3b17dc737d5ca45a1418f200a4a23d34b24
2019-02-08 16:54:08 -08:00
Mikhail Naganov 1c00aec7d0 Improve error messages about paths am: ab1f518fb0
am: 33b67a24e6

Change-Id: I3ff19e2dcf8804da48fecc7e2260ac08651422c4
2019-02-08 16:50:09 -08:00
Mikhail Naganov 33b67a24e6 Improve error messages about paths
am: ab1f518fb0

Change-Id: I4e33bfcf1e6def55e3a1ada546d804f728afebb9
2019-02-08 16:46:04 -08:00
Mikhail Naganov e0d0a453d2 Docs: update path to soong_build.html
On the recent versions, the module types help
is generated into $OUT_DIR/soong/docs/soong_build.html

Test: make && ls -l out/soong/docs/soong_build.html
Change-Id: Ib7522a417fd5467f19d7393672a592d349f276f4
2019-02-08 16:41:40 -08:00
Mikhail Naganov ab1f518fb0 Improve error messages about paths
Quote the path parameter in the message to distinguish it
from the text. This makes messages more understandable.

Before: source path include does not exist
After:  source path "include" does not exist

Test: build Android
Change-Id: I99dbbce3cf090682a230d05bf120549a2cc7af3c
2019-02-08 13:32:08 -08:00
Jaewoong Jung 9e47b0e136 Merge "Add Android.mk lines for package name overriding." am: ea66057a50 am: 9b3e4cc3af
am: afe716dcdb

Change-Id: I5074c6721c4d4d39e4fc5611621ac56318742722
2019-02-08 13:27:31 -08:00
Jaewoong Jung afe716dcdb Merge "Add Android.mk lines for package name overriding." am: ea66057a50
am: 9b3e4cc3af

Change-Id: I7e78ebef525e27a1d1e92edbb75ce7152cac026e
2019-02-08 13:22:41 -08:00
Jaewoong Jung 9b3e4cc3af Merge "Add Android.mk lines for package name overriding."
am: ea66057a50

Change-Id: Ib321d7fbf6a1494a78f7c6763d21b14294c54a39
2019-02-08 13:17:16 -08:00
Jaewoong Jung ea66057a50 Merge "Add Android.mk lines for package name overriding." 2019-02-08 21:00:27 +00:00
Jiyong Park b32e622293 Merge "Handle the case when a symbol is annotated with "# apex vndk"" am: 3415780021 am: 11e6e5c76c
am: afdb54813e

Change-Id: Ic63b1ee87e9f3d958ea67945a517a2aba64a2b60
2019-02-08 11:05:39 -08:00
Jiyong Park afdb54813e Merge "Handle the case when a symbol is annotated with "# apex vndk"" am: 3415780021
am: 11e6e5c76c

Change-Id: I91c072425b69efbc96b49235c3b4f7e7d3846218
2019-02-08 11:01:39 -08:00
Jiyong Park 11e6e5c76c Merge "Handle the case when a symbol is annotated with "# apex vndk""
am: 3415780021

Change-Id: I2567afe4afab0f9a71d87f3cafffb21f35fdf0a0
2019-02-08 10:57:34 -08:00
Treehugger Robot 3415780021 Merge "Handle the case when a symbol is annotated with "# apex vndk"" 2019-02-08 18:46:44 +00:00
Alex Light 815c4e92f8 Merge "Add support for test_apex" am: 39af6de6c1 am: 59a80fa75e
am: 1af41e318c

Change-Id: I48dc38a58db356b072f6dca40370c7017e70b8a0
2019-02-08 07:55:51 -08:00
Alex Light 1af41e318c Merge "Add support for test_apex" am: 39af6de6c1
am: 59a80fa75e

Change-Id: I4a8cc8f94b0c990075878817be127dd2e3678010
2019-02-08 07:51:33 -08:00
Alex Light 59a80fa75e Merge "Add support for test_apex"
am: 39af6de6c1

Change-Id: I048c0b6d5148a5ec6a28e4ac90cc886388625ce5
2019-02-08 07:46:34 -08:00
Alex Light 39af6de6c1 Merge "Add support for test_apex" 2019-02-08 15:38:24 +00:00
Colin Cross e4246abd7f Make manifest and APK agree on uncompressed native libs
Only put uncompressed native libs in an APK if the min_sdk_version
supports it (>= 23, Marshmallow), and set
android:extractNativeLibs="false" in the AndroidManifest.xml so
that the platform won't extract them anyways.

Bug: 117618214
Test: m checkbuild
Change-Id: I760017e48bf3c6b618aabde0982df45995765d48
2019-02-08 15:24:47 +00:00
Jiyong Park 1431765f8d Handle the case when a symbol is annotated with "# apex vndk"
This change fixes a bug that a symbol is omitted for apex (or vndk) when
it is annotated with "# vndk apex" (or "# apex vndk).

Bug: 123349183
Test: python3 test_gen_stub_libs.py

Change-Id: I344d6e70732bae8877cb16bbe881edb79fe90670
2019-02-08 20:36:26 +09:00
Anton Hansson 18b30f9a4c Workaround dupe resource directories am: 129b9ceeb1 am: 2fc1d0f1ea
am: c8fa538ac0

Change-Id: I80de41497623113dd12cf65c41a8148a294109dc
2019-02-08 00:14:06 -08:00
Anton Hansson c8fa538ac0 Workaround dupe resource directories am: 129b9ceeb1
am: 2fc1d0f1ea

Change-Id: I805e574de880122032b0fe4b1dc5148d6bf8dfb5
2019-02-08 00:10:03 -08:00
Anton Hansson 2fc1d0f1ea Workaround dupe resource directories
am: 129b9ceeb1

Change-Id: I5f685b76f379589f5964fc1c59c2597cfd44d3dc
2019-02-08 00:06:04 -08:00
Anton Hansson 129b9ceeb1 Workaround dupe resource directories
A few apps are co-located with libraries they depend on statically,
and because it's not possible to specify "no resource_dirs", they
both end up depending on the same resources, leading to downstream
problems for RRO generation.

Workaround the problem by de-duping the RRO paths for a single app
for now.

Bug: 124035856
Bug: 123510624
Test: make with enforce_rro == *
Change-Id: I251f123eb4280ed72e1ccd2212cb5f3e746e645d
2019-02-08 07:55:00 +00:00
Colin Cross 95f416cac8 Merge "Remove unused dexpreopt UseEmbeddedDex" am: 6ff48cd048 am: 98b1442180
am: ad7571f464

Change-Id: I3d77352678e4ae698583b5f8426b055f5c4a03fc
2019-02-07 23:39:38 -08:00
Colin Cross ad7571f464 Merge "Remove unused dexpreopt UseEmbeddedDex" am: 6ff48cd048
am: 98b1442180

Change-Id: I3ba59551e0f3309aa824cddeaec7585e84ea390b
2019-02-07 23:35:24 -08:00
Colin Cross 98b1442180 Merge "Remove unused dexpreopt UseEmbeddedDex"
am: 6ff48cd048

Change-Id: I3275b61f6f16bcbe7d05c08d72a6f5df7afc8137
2019-02-07 23:30:47 -08:00
Treehugger Robot 6ff48cd048 Merge "Remove unused dexpreopt UseEmbeddedDex" 2019-02-08 07:19:33 +00:00
Colin Cross 45b69010c9 Merge "Make privileged java_library modules use uncompressed dex" am: 89ba9715ef am: 8367be9da7
am: 309ce85acd

Change-Id: I3e71ce5a2e84812bc61bd7e7051b34811027e092
2019-02-07 18:56:20 -08:00
Colin Cross bbe7e8261e Merge "Allow disabling implicit resource_dirs and asset_dirs" am: 3e48a994e8 am: 73481a4cf6
am: d6fa3b1cbf

Change-Id: I64e113ce97c8d103a141ec65caacf67c08464b5f
2019-02-07 18:55:49 -08:00
Colin Cross 309ce85acd Merge "Make privileged java_library modules use uncompressed dex" am: 89ba9715ef
am: 8367be9da7

Change-Id: I18d0185aa672683f78591b603f5d74e805a50237
2019-02-07 18:48:06 -08:00
Colin Cross d6fa3b1cbf Merge "Allow disabling implicit resource_dirs and asset_dirs" am: 3e48a994e8
am: 73481a4cf6

Change-Id: I316d86aa06561f1a17119347414efdff8fdb7730
2019-02-07 18:47:37 -08:00
Colin Cross 8367be9da7 Merge "Make privileged java_library modules use uncompressed dex"
am: 89ba9715ef

Change-Id: I8d6f5a8ada04691c56bc4dfe72157e640ac7ec7c
2019-02-07 18:39:12 -08:00
Colin Cross 73481a4cf6 Merge "Allow disabling implicit resource_dirs and asset_dirs"
am: 3e48a994e8

Change-Id: I36c78ef80aec36666dd8ea755ae298fa02398776
2019-02-07 18:38:41 -08:00
Colin Cross 89ba9715ef Merge "Make privileged java_library modules use uncompressed dex" 2019-02-08 02:29:59 +00:00
Colin Cross 3e48a994e8 Merge "Allow disabling implicit resource_dirs and asset_dirs" 2019-02-08 02:29:35 +00:00
Colin Cross 09a65ab6ca Remove unused dexpreopt UseEmbeddedDex
dexpreopt doesn't need to know about UseEmbeddedDex, it has
already been taken into account for UncompressedDex.

Test: m checkbuild
Change-Id: I5508aa43bb8bdb06e20cf93bc5171a5e78833983
2019-02-08 02:27:59 +00:00
Colin Cross c8e819341d Remove the hiddenapi presingleton am: 697412f058 am: 3def9efe61
am: 57bda7a089

Change-Id: I59d0570d5aa1870abcbb7d9cda70a4171af0dfee
2019-02-07 18:21:58 -08:00
Colin Cross 32fd5947ca Make MakeVarsContext a PathContext am: 65494b962b am: e5bc0d6253
am: 1c15057b94

Change-Id: I3521fec124f35017812ed2c3faf9fb7e46f73a3a
2019-02-07 18:21:45 -08:00