Commit Graph

23333 Commits

Author SHA1 Message Date
TreeHugger Robot
966e995729 Merge "Enforce permitted_packages for Q+ and R+ modules" into rvc-dev am: d65089b4a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11761419

Change-Id: I66510e2e3792623c77e0fea25d2043b963b1f951
2020-06-22 18:09:56 +00:00
TreeHugger Robot
d65089b4a4 Merge "Enforce permitted_packages for Q+ and R+ modules" into rvc-dev 2020-06-22 17:55:16 +00:00
Jooyung Han
b365f35fef Merge "apex: make allowed_files prop overridable" into rvc-dev am: d166f79278
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11931025

Change-Id: I2600c560d596446af255b117abfc07dc1d1f1860
2020-06-22 17:20:52 +00:00
Jooyung Han
d166f79278 Merge "apex: make allowed_files prop overridable" into rvc-dev 2020-06-22 17:05:58 +00:00
Paul Duffin
ff6e55b301 Merge "Fix build breakages when WITHOUT_CHECK_API=true" into rvc-dev am: 4c21463f04
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11931085

Change-Id: Ibf4d31078a4a206c7296241aef8c06cfa7b0becb
2020-06-22 12:50:21 +00:00
Paul Duffin
4c21463f04 Merge "Fix build breakages when WITHOUT_CHECK_API=true" into rvc-dev 2020-06-22 12:39:41 +00:00
Paul Duffin
968ffd1f60 [automerger skipped] Instrument the java_sdk_library implementation library am: 49d3a523bf -s ours
am skip reason: Change-Id I8183bd9613dfaf0ded5f9ac36567d5d29a8941e8 with SHA-1 296cf33171 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11925242

Change-Id: I2a4710240906dbf144238a40901a549f1e3b1676
2020-06-20 19:13:43 +00:00
Paul Duffin
5702d40eee [automerger skipped] Fix check-boot-jars when a boot jar is provided by prebuilt am: 9ee66da850 -s ours
am skip reason: Change-Id I545c5c9072dd472337d2f9b4dfdf08f53c981662 with SHA-1 44b481b81b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11895159

Change-Id: I8780ec3d28cb2971cffd576582c06dd48ef3b12f
2020-06-20 19:13:41 +00:00
Paul Duffin
49d3a523bf Instrument the java_sdk_library implementation library
Bug: 159241638
Test: build jacoco-report-classes-all.jar with and without
      prebuilt for framework-tethering. Ensure it contains the
      jacoco-report-classes.jar for framework-tethering.
Change-Id: I8183bd9613dfaf0ded5f9ac36567d5d29a8941e8
Merged-In: I8183bd9613dfaf0ded5f9ac36567d5d29a8941e8
2020-06-20 11:38:22 +01:00
Paul Duffin
9ee66da850 Fix check-boot-jars when a boot jar is provided by prebuilt
Previously, when a boot jar was provided by a java_sdk_library_import
module the check-boot-jars check failed because the file it depended on
was not available. In an incremental build the build failed due to the
file in the out directory not having a rule to generate it.

That was because the module was named prebuilt_<module>.<apex> instead
of <module>.<apex>. This was fixed by simply removing prebuilt_ prefix
from the name if it was present.

After fixing that the check-boot-jars still did not work properly
because it was expecting a jar file containing .class files but instead
was given a jar file containing .dex files which meant the check did
not work properly.

This was fixed by defining a new ApexDependency interface for use by
the apex/apex.go code to use instead of java.Dependency for generating
the androidmk entries. The *SdkLibraryImport type then implemented
those, by delegating to the implementation library.

Bug: 158304459
Bug: 159112414
Test: m check-boot-jars
      m checkbuild
	  manual inspection of the .jar file used by check-boot-jars to
	  ensure it contained .class files and not .dex files.
Change-Id: I545c5c9072dd472337d2f9b4dfdf08f53c981662
Merged-In: I545c5c9072dd472337d2f9b4dfdf08f53c981662
2020-06-20 11:38:08 +01:00
Jooyung Han
faa5399b3f apex: make allowed_files prop overridable
Because override_apex can modify the contents of the base apex,
allowed_files (which describes the contents) should be overridable.

Bug: 159503079
Bug: 159392784
Bug: 158169437
Test: m (soong test added)
Change-Id: I12744b0465dc3cfc90a66643867e65b4092cd0f7
2020-06-20 12:56:49 +09:00
Yo Chiang
c2ade3fb63 Merge "java_sdk_library: Require xml permission file only if it is generated" am: 34753055d1 am: cdb20caaca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324106

Change-Id: I5de0149b8c0afcab72c9c75cca6ae3c33d788402
2020-06-20 03:51:33 +00:00
Yo Chiang
cdb20caaca Merge "java_sdk_library: Require xml permission file only if it is generated" am: 34753055d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324106

Change-Id: I7d4840e75d7e9e96bf1a088b5a73f3ef424b2dcf
2020-06-20 03:35:32 +00:00
Yo Chiang
34753055d1 Merge "java_sdk_library: Require xml permission file only if it is generated" 2020-06-20 03:19:17 +00:00
Ramy Medhat
0b85c50817 Merge "Add sandbox property to the javadoc rule." am: 997a2f5b4e am: a195919e38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335053

Change-Id: I31135dccd6451355fdaff3f86db309f45fc2a2a7
2020-06-20 01:58:49 +00:00
Ramy Medhat
a195919e38 Merge "Add sandbox property to the javadoc rule." am: 997a2f5b4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335053

Change-Id: I799306fdf6e99e5bb564224520fc45311d8f3523
2020-06-20 01:45:57 +00:00
Ramy Medhat
997a2f5b4e Merge "Add sandbox property to the javadoc rule." 2020-06-20 01:33:24 +00:00
Colin Cross
2ef6a3b3dd [automerger skipped] Merge changes I25c77994,I7da78ef4,I89197d0a into rvc-dev am: 5ef04d1ee7 -s ours
am skip reason: Change-Id I25c7799438cfec43163e757637c65b8657488d36 with SHA-1 92e4b46af5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11931844

Change-Id: Ie7aa6484a4b23d27e20cadb03db627250a4a08dd
2020-06-20 00:02:19 +00:00
Colin Cross
5ef04d1ee7 Merge changes I25c77994,I7da78ef4,I89197d0a into rvc-dev
* changes:
  Support adding extra lint checks
  Allow kotlin modules to skip packaging the kotlin stdlib
  Fix annotation processors in kotlin modules that generate resources
2020-06-19 23:48:25 +00:00
Colin Cross
11161909ae [automerger skipped] Merge changes from topic "soong-lint" into rvc-dev am: 94c9790591 -s ours
am skip reason: Change-Id I5a530975b73ba767fef45b257d4f9ec901a19fcb with SHA-1 014489c1e6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11914386

Change-Id: I68e34444e472d7902efeb4f9b02781b79e4d6b42
2020-06-19 21:10:34 +00:00
Colin Cross
94c9790591 Merge changes from topic "soong-lint" into rvc-dev
* changes:
  Add support for running Android lint on java and android modules.
  Consolidate adding common java properties
2020-06-19 20:58:48 +00:00
Treehugger Robot
3f7e937aa8 Merge "[Rust] cdylibs can now link against dylibs." am: f649c05239 am: 9cc78575ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1344796

Change-Id: I293e88cc86302ee936cc03867132b11e5d70a812
2020-06-19 20:53:32 +00:00
Treehugger Robot
9cc78575ef Merge "[Rust] cdylibs can now link against dylibs." am: f649c05239
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1344796

Change-Id: I802d6fc095f95f36f09c74661048a412177eb9ab
2020-06-19 20:39:39 +00:00
Treehugger Robot
f649c05239 Merge "[Rust] cdylibs can now link against dylibs." 2020-06-19 20:25:47 +00:00
Colin Cross
8a3050e50d Merge changes I25c77994,I7da78ef4,I89197d0a am: 181c2a40d8 am: 7be9f60488
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1344320

Change-Id: I8b955daa70d3348ab011dee437ce028dd8c74a2f
2020-06-19 20:23:57 +00:00
Colin Cross
7be9f60488 Merge changes I25c77994,I7da78ef4,I89197d0a am: 181c2a40d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1344320

Change-Id: Id4c51df28d8fb4493d68dbb420eaca67455e258d
2020-06-19 20:03:21 +00:00
Colin Cross
205a504053 Support adding extra lint checks
Add a lint.extra_check_modules property to list modules to use as
plugins to Lint.

Bug: 153485543
Test: m checkbuild
Change-Id: I25c7799438cfec43163e757637c65b8657488d36
Merged-In: I25c7799438cfec43163e757637c65b8657488d36
(cherry picked from commit 92e4b46af5)
2020-06-19 12:53:09 -07:00
Colin Cross
aaf58061a0 Allow kotlin modules to skip packaging the kotlin stdlib
Host tools like lint may package their own version of the kotlin
stdlib, and any jars loaded by them shouldn't contain the platform
version.  Add a static_kotlin_stdlib property that defaults to true
to allow building the module without staticalling including the kotlin
stdlib.

Bug: 153485543
Test: m ApiFinder
Change-Id: I7da78ef493806ce4ab0050e4ee9e8d330b0509c8
Merged-In: I7da78ef493806ce4ab0050e4ee9e8d330b0509c8
(cherry picked from commit 0b67a8bd0f)
2020-06-19 12:53:09 -07:00
Colin Cross
3791b45f67 Fix annotation processors in kotlin modules that generate resources
The kapt rule was only keeping the generated sources, and not the
generated classes directory.  The generated classes directory will
contain resources generated by the annotation processor and needs
to be added to the final jar.

Test: m ApiFinder
Bug: 153485543
Change-Id: I89197d0afcb1eee011c01aa400f9977e66f43768
Merged-In: I89197d0afcb1eee011c01aa400f9977e66f43768
(cherry picked from commit 9ca38d22a4)
2020-06-19 12:53:09 -07:00
Colin Cross
181c2a40d8 Merge changes I25c77994,I7da78ef4,I89197d0a
* changes:
  Support adding extra lint checks
  Allow kotlin modules to skip packaging the kotlin stdlib
  Fix annotation processors in kotlin modules that generate resources
2020-06-19 19:52:37 +00:00
Paul Duffin
e20f474e55 Merge "Instrument the java_sdk_library implementation library" am: 333cb9ea44 am: 076ff4db08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343578

Change-Id: I21aced434112c564b770feba6e6aa714db50ea4e
2020-06-19 18:42:32 +00:00
Paul Duffin
076ff4db08 Merge "Instrument the java_sdk_library implementation library" am: 333cb9ea44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343578

Change-Id: I1a94553c0ca9cd35f5560b1d9db2717c75ffe374
2020-06-19 18:30:12 +00:00
Paul Duffin
333cb9ea44 Merge "Instrument the java_sdk_library implementation library" 2020-06-19 18:20:28 +00:00
Paul Duffin
86672f6f4e Fix build breakages when WITHOUT_CHECK_API=true
Bug: 158578354
Test: export WITHOUT_CHECK_API=true
      m checkbuild
Change-Id: I7b5fff40b870c9d754f779ff1c3314bac7e42440
2020-06-19 19:15:29 +01:00
Ivan Lozano
7e741cca30 [Rust] cdylibs can now link against dylibs.
Bug: 144861059
Test: cd external/rust/crates; mma
Test: Manual verification through ldd that libstd is a dependency
Change-Id: I603cf519215317aa8c400cd0f6ebb1b58f5bcf15
2020-06-19 13:54:26 -04:00
TreeHugger Robot
0de4de0c64 Merge "Don't remove entries for overriddable modules" into rvc-dev am: f58305a6a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11908302

Change-Id: I20b9d3c522447ebc32cf861ae9b75f09c3c4fccc
2020-06-19 14:18:42 +00:00
TreeHugger Robot
f58305a6a4 Merge "Don't remove entries for overriddable modules" into rvc-dev 2020-06-19 13:59:00 +00:00
Nicolas Geoffray
e59a920f18 Merge "Add ICU SDK and module_exports to the list." am: b758a37876 am: 38535a2388
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343576

Change-Id: I92eae9a6e07dc933ea77f194ec22c8dea5bbc536
2020-06-19 08:00:37 +00:00
Nicolas Geoffray
38535a2388 Merge "Add ICU SDK and module_exports to the list." am: b758a37876
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343576

Change-Id: Iccced3ac3565a36d35f8963a2137277203806ddd
2020-06-19 07:35:48 +00:00
Nicolas Geoffray
b758a37876 Merge "Add ICU SDK and module_exports to the list." 2020-06-19 07:22:33 +00:00
Inseob Kim
5ba301f5c7 [automerger skipped] Merge "Exclude kernel_headers from vendor snapshot" into rvc-dev am: fc14a1383b -s ours
am skip reason: Change-Id If47634678797973266fcf502739216daf28ad790 with SHA-1 65ca36a72e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11882387

Change-Id: I4a72296ec0094cee88d1781ccc3dab5a4de8915a
2020-06-19 03:59:05 +00:00
Inseob Kim
fc14a1383b Merge "Exclude kernel_headers from vendor snapshot" into rvc-dev 2020-06-19 03:40:30 +00:00
Makoto Onuki
4ef6bce3cf Merge "Disable "show member in hidden parent" metalava error" am: 56ecbaef4c am: 7d91b8867c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340546

Change-Id: Ibcd5a9333017685404f5a97b18bb490ad0fc600f
2020-06-18 23:18:28 +00:00
Makoto Onuki
7d91b8867c Merge "Disable "show member in hidden parent" metalava error" am: 56ecbaef4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340546

Change-Id: Id9f19411ba06df0b9c037e0596df16e637593e3a
2020-06-18 23:08:30 +00:00
Treehugger Robot
8448726d3d Merge "Add test-suite-tag to test_options" am: bf6a8aeec2 am: 433b1c84f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343577

Change-Id: Id2443a7d496061bbf858eea7a7c4f65b3bec5035
2020-06-18 23:00:00 +00:00
Colin Cross
92e4b46af5 Support adding extra lint checks
Add a lint.extra_check_modules property to list modules to use as
plugins to Lint.

Bug: 153485543
Test: m checkbuild
Change-Id: I25c7799438cfec43163e757637c65b8657488d36
2020-06-18 15:58:32 -07:00
Colin Cross
0b67a8bd0f Allow kotlin modules to skip packaging the kotlin stdlib
Host tools like lint may package their own version of the kotlin
stdlib, and any jars loaded by them shouldn't contain the platform
version.  Add a static_kotlin_stdlib property that defaults to true
to allow building the module without staticalling including the kotlin
stdlib.

Bug: 153485543
Test: m ApiFinder
Change-Id: I7da78ef493806ce4ab0050e4ee9e8d330b0509c8
2020-06-18 15:58:32 -07:00
Colin Cross
9ca38d22a4 Fix annotation processors in kotlin modules that generate resources
The kapt rule was only keeping the generated sources, and not the
generated classes directory.  The generated classes directory will
contain resources generated by the annotation processor and needs
to be added to the final jar.

Test: m ApiFinder
Bug: 153485543
Change-Id: I89197d0afcb1eee011c01aa400f9977e66f43768
2020-06-18 15:58:28 -07:00
Makoto Onuki
56ecbaef4c Merge "Disable "show member in hidden parent" metalava error" 2020-06-18 22:57:48 +00:00
Treehugger Robot
433b1c84f9 Merge "Add test-suite-tag to test_options" am: bf6a8aeec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1343577

Change-Id: Id12f80dcedd8bccb62db566a8734e6418156acc4
2020-06-18 22:45:31 +00:00