Commit Graph

2373 Commits

Author SHA1 Message Date
Chris Gross
c81742d9f7 Merge "Allow bootjars in system_ext." am: 7097b0580c am: d82aae1f16
Change-Id: I3f0ce5311c84781799c9edf32e7f8f36993f3701
2020-05-05 21:33:58 +00:00
Chris Gross
7097b0580c Merge "Allow bootjars in system_ext." 2020-05-05 21:12:39 +00:00
Anton Hansson
a1910e8488 Merge "Disable "check last" for test api" 2020-05-05 15:42:53 +00:00
Anton Hansson
6478ac17fc Disable "check last" for test api
@TestApi does not have stability requirements, so we shouldn't be
checking its compatibility with the last released version.

This CL removes the expectation that a test-removed.txt is checked in
for each module during finalization.

Bug: 155197156
Test: m (with SDK 30 imported)
Change-Id: Ib3f671493f1d230116bec51b884e8072643b10d4
Merged-In: Ib3f671493f1d230116bec51b884e8072643b10d4
(cherry picked from commit 6bf8e415a50826a378cc58aba87854f52c9f1d32)
2020-05-05 14:52:49 +01:00
satayev
49ad72d4ef Merge changes Ie6568cb8,Ibd521c96 am: 292e7c0721 am: a07f9df5d7
Change-Id: I4dcd1f47b080a71a97db0b10c1ebfc45b8d59bdb
2020-05-05 13:14:14 +00:00
Anton Hansson
fb6d57e134 Merge "Make prebuilt_sdk support module-lib and system-server" 2020-05-05 13:12:10 +00:00
satayev
292e7c0721 Merge changes Ie6568cb8,Ibd521c96
* changes:
  Introduce min_sdk_version to deps info.
  Introduce flat deps info list.
2020-05-05 12:47:48 +00:00
Anton Hansson
2ddb61f72c Merge "Treat lint warnings as errors" into rvc-dev am: 3292836210
Change-Id: I54329e9e9bb7689d44526e6453aff0bcbca11c94
2020-05-05 10:17:28 +00:00
Anton Hansson
3292836210 Merge "Treat lint warnings as errors" into rvc-dev 2020-05-05 09:58:51 +00:00
Jaewoong Jung
c896a76a5d Merge "Make android_app_import multi targets arch module." am: baf8c3a804 am: 068e22ebb9
Change-Id: I82330a9900ac3426e536866f1cbdb3601b07ed69
2020-05-05 01:48:43 +00:00
Jaewoong Jung
baf8c3a804 Merge "Make android_app_import multi targets arch module." 2020-05-05 01:20:51 +00:00
Anton Hansson
e714565ce8 Treat lint warnings as errors
Warnings get lost in the build spam and never get fixed. Right now is
the best time to do this, because we only track the warnings/errors
since the last released API. The API has just been frozen, so the number
of warnings is at an all-time low.

Whitelist the car lib and test stubs for now, which produce a lot of
warnings.

Bug: 154317059
Test: presubmit
Change-Id: I9aa7cb1b947c6c664f15e2bd5835d76eaac1237a
2020-05-04 21:47:34 +01:00
Anton Hansson
ede5078144 Merge "Fix soong crashing when there's no baseline file" 2020-05-04 20:33:26 +00:00
Artur Satayev
480e25b74f Introduce min_sdk_version to deps info.
Bug: 149622332
Test: m
Change-Id: Ie6568cb8a82d5cca9a3dc91b5a068abf4b0632dc
2020-05-04 19:44:28 +01:00
Anton Hansson
6778b32561 Merge "Disable "check last" for test api" into rvc-dev am: fc39bd861d
Change-Id: Ib1bb10fa93d3d77afdf47dcfbfe58792d63f4765
2020-05-04 17:57:12 +00:00
Anton Hansson
fc39bd861d Merge "Disable "check last" for test api" into rvc-dev 2020-05-04 17:44:05 +00:00
satayev
7c54f0358c Merge "Ensure APEX's Java deps use stable SDKs." am: 9d6ea77c52 am: 858239ce20
Change-Id: Icf58cab4392926b11836447d24161ef224e3ac09
2020-05-04 16:31:30 +00:00
satayev
9d6ea77c52 Merge "Ensure APEX's Java deps use stable SDKs." 2020-05-04 16:03:44 +00:00
Ulya Trafimovich
7ea319a126 Add forgotten apex prefix to Jacoco boot image module. am: 817133ee2a am: 0e3f053f53
Change-Id: I6189afb05e50dba93949615ac969380e952adbf3
2020-05-04 13:43:53 +00:00
Anton Hansson
26e7ba575b Merge "Make prebuilt_sdk support module-lib and system-server" into rvc-dev am: e16ca7d52d
Change-Id: I7d06f1c1c8cd34b1725b76c53509e7c217837487
2020-05-04 13:02:52 +00:00
Anton Hansson
8d23969bb6 Make prebuilt_sdk support module-lib and system-server
This makes prebuilt_sdk look for and create modules in the module-lib
and system-server subdirs too, e.g.:
    framework-wifi.api.module-lib.latest

Bug: 149293194
Test: follow-up change
Change-Id: Idbded6b633315034e669e9c5dd2bd30725d5c76b
Merged-In: Idbded6b633315034e669e9c5dd2bd30725d5c76b
2020-05-04 13:52:43 +01:00
Anton Hansson
e16ca7d52d Merge "Make prebuilt_sdk support module-lib and system-server" into rvc-dev 2020-05-04 12:51:31 +00:00
Ulya Trafimovich
817133ee2a Add forgotten apex prefix to Jacoco boot image module.
This is a follow-up for https://r.android.com/1292915, which introduced
two-column format for the components of the boot jar list. This CL
fixes build failure for the coverage build.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Change-Id: Ib8b156bf81943fe07084cbce5e7e9bf70e759a5d
2020-05-04 12:16:25 +01:00
Ulyana Trafimovich
f1e207c738 Merge "Use two-column format for PRODUCT_BOOT_JARS components." am: 2aa8e0be11 am: 728f0c5dae
Change-Id: I0ac57804b7c9f3bc5a4f3433e7e2e6d7011cc935
2020-05-04 09:08:11 +00:00
Ulyana Trafimovich
2aa8e0be11 Merge "Use two-column format for PRODUCT_BOOT_JARS components." 2020-05-04 08:57:47 +00:00
Chris Gross
06c8036ac8 Allow bootjars in system_ext.
Bug: 148385042
Test: Built and booted Pixel 3a both with and without a boot jar in system_ext.
Change-Id: I0702aa8259478a71cf96a5cd3a425071ccdafdfb
2020-05-02 14:56:51 -07:00
Anton Hansson
422530f04f Merge "Fix soong crashing when there's no baseline file" into rvc-dev am: 8b9273d99e
Change-Id: Ibd30b9ef0800d98bd242d0c39c343d9a646242af
2020-05-02 10:29:12 +00:00
Anton Hansson
75ac71eea2 Fix soong crashing when there's no baseline file
Soong was referencing the baseline file regardless of whether it was
valid or not.

Also update the lint message to match the one metalava itself prints,
which only suggests whitelisting the error if it's not possible to fix
it properly.

Bug: 154616909
Test: m (with lint error)
Change-Id: I4c6ec327a59aefe74825b4c4719393dd267ba3aa
Merged-In: I4c6ec327a59aefe74825b4c4719393dd267ba3aa
(cherry picked from commit 34ced82d2a)
2020-05-02 11:23:34 +01:00
Anton Hansson
8b9273d99e Merge "Fix soong crashing when there's no baseline file" into rvc-dev 2020-05-02 10:23:16 +00:00
Anton Hansson
5ff28e50b8 Disable "check last" for test api
@TestApi does not have stability requirements, so we shouldn't be
checking its compatibility with the last released version.

This CL removes the expectation that a test-removed.txt is checked in
for each module during finalization.

Bug: 155197156
Test: m (with SDK 30 imported)
Change-Id: Ib3f671493f1d230116bec51b884e8072643b10d4
2020-05-02 11:19:36 +01:00
Colin Cross
2a5fb91370 Merge changes from topic "sdk_version_variant" into rvc-dev
* changes:
  Add sdk mutator for native modules
  Require apps built against the SDK to use JNI built against the NDK
2020-05-02 01:41:18 +00:00
Jaewoong Jung
243688ea1b Make android_app_import multi targets arch module.
This makes it consistent with android_app. Also, most android_app_import
modules with JNI libs target a single arch.

Test: TreeHugger
Bug: 154281342
Change-Id: I5bbb2d2b733bbd6b868898285683ba5ff45be10b
2020-05-01 15:50:08 -07:00
Songchun Fan
4b25e319e6 Revert "[soong] new field in Android.bp to request APK signing V4"
This reverts commit 17d69e3484.

Reason for revert: This new field is not useful without dependencies in aosp

Test: builds
Change-Id: I87bd820cd6dbc5274ce3d28c4578381718aa805d
Merged-In: I70d6f7dc751510311b03e245b2189a76b395a49c
2020-05-01 11:29:36 -07:00
Anton Hansson
0fd1de5f0b Make prebuilt_sdk support module-lib and system-server
This makes prebuilt_sdk look for and create modules in the module-lib
and system-server subdirs too, e.g.:
    framework-wifi.api.module-lib.latest

Bug: 149293194
Test: follow-up change
Change-Id: Idbded6b633315034e669e9c5dd2bd30725d5c76b
2020-05-01 18:37:15 +01:00
Anton Hansson
34ced82d2a Fix soong crashing when there's no baseline file
Soong was referencing the baseline file regardless of whether it was
valid or not.

Also update the lint message to match the one metalava itself prints,
which only suggests whitelisting the error if it's not possible to fix
it properly.

Bug: 154616909
Test: m (with lint error)
Change-Id: I4c6ec327a59aefe74825b4c4719393dd267ba3aa
2020-05-01 17:12:36 +01:00
Paul Duffin
da36425419 java_sdk_library: Correct stubs source generation classpath
The stubs source should be generated using the same classpath that is
used to compile the implementation library, i.e. sdk_version,
system_modules and libs/static_libs.

Previously, the sdk_version used to generate the stubs was different.
It provided access to a wider API surface than was necessary. This
change fixes that.

Test: m checkapi
Bug: 155164730
Merged-In: I7bc54dc4ad12a7d6c7503111d1322ee35c56d713
Change-Id: I7bc54dc4ad12a7d6c7503111d1322ee35c56d713
(cherry picked from commit 7b78b4d404)
2020-05-01 10:38:42 +01:00
Jaewoong Jung
32335f90b1 Merge "Add defaults support to runtime_resource_overlay." 2020-04-30 17:43:37 +00:00
Ulya Trafimovich
50c4a4b19f Use two-column format for PRODUCT_BOOT_JARS components.
The first component is the apex name, or a special name "platform"
if the boot jar is a platform jar rather than a part of some apex.
This is a prerequisite change for moving core-icu4j to a separate
com.android.i18n apex.

Old one-column format is still supported, but all unqualified
components of PRODUCT_BOOT_JARS get "platform:" prepended to them
after reading the product makefiles.

Test: aosp_walleye-userdebug boots
Bug: 138994281
Change-Id: Ic229159fdcdaf6182210a53b63850a389dd786fc
2020-04-30 14:42:32 +01:00
Treehugger Robot
b60162643f Merge changes I7bc54dc4,I4e9bfebd am: b407131a0e am: 1486c8a973
Change-Id: I1afa4231c15a64e8020113b10879adec66bf08fa
2020-04-29 21:54:33 +00:00
Treehugger Robot
b407131a0e Merge changes I7bc54dc4,I4e9bfebd
* changes:
  java_sdk_library: Correct stubs source generation classpath
  Fix definition of android_stubs_current in sdk tests
2020-04-29 21:31:21 +00:00
Paul Duffin
7b78b4d404 java_sdk_library: Correct stubs source generation classpath
The stubs source should be generated using the same classpath that is
used to compile the implementation library, i.e. sdk_version,
system_modules and libs/static_libs.

Previously, the sdk_version used to generate the stubs was different.
It provided access to a wider API surface than was necessary. This
change fixes that.

Test: m checkapi
Bug: 155164730
Change-Id: I7bc54dc4ad12a7d6c7503111d1322ee35c56d713
2020-04-29 19:03:45 +01:00
Treehugger Robot
6e2fb5c0cd Merge "soong: Add support for override_runtime_resource_overlay" 2020-04-29 17:30:00 +00:00
Liz Kammer
9c11f7fba5 Merge "Document Instrumentation_for android app tests." am: 8e25bcb895 am: 189f6704c1
Change-Id: Idfb4f575e84eb865545e06e355efff4c425d7331
2020-04-29 16:39:47 +00:00
Liz Kammer
8e25bcb895 Merge "Document Instrumentation_for android app tests." 2020-04-29 16:06:49 +00:00
Roshan Pius
4df2bc76d5 soong: Add support for override_runtime_resource_overlay
Bug: 154960712
Test: go test ./... -test.v -run TestOverrideAndroidApp
(cherry-picked from ag/11270710)

Change-Id: I8ca9d173b6ab7f9306c83c2b434107111aa2ca88
Merged-In: I8ca9d173b6ab7f9306c83c2b434107111aa2ca88
2020-04-29 09:01:51 -07:00
Paul Duffin
ede72e3ee7 Merge "Remove obsolete var apiFileMakeVariableSuffix" into rvc-dev am: cceb7f2c10
Change-Id: Ia613f0da5fcfa16bfa06c4ee3dcb28c66b32d2c6
2020-04-29 08:45:06 +00:00
Paul Duffin
cceb7f2c10 Merge "Remove obsolete var apiFileMakeVariableSuffix" into rvc-dev 2020-04-29 08:22:35 +00:00
Liz Kammer
6b0c55263c Document Instrumentation_for android app tests.
Test: m soong_docs

Change-Id: I84fd20ea563fc75dc04ac41f44f2f53df994925f
2020-04-28 16:45:51 -07:00
Roshan Pius
db48e6b051 Merge "soong: Add support for override_runtime_resource_overlay" into rvc-dev am: 016159dfe4
Change-Id: Ie6a180887eab39fbf46a583a2629c2924add4c5b
2020-04-28 22:11:40 +00:00
Roshan Pius
016159dfe4 Merge "soong: Add support for override_runtime_resource_overlay" into rvc-dev 2020-04-28 22:09:15 +00:00