diff options
| author | Anton Hansson <hansson@google.com> | 2020-04-09 13:29:59 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-06-05 15:16:16 +0100 |
| commit | 3f07ab2d63e2a0892b45d9200a15b2fbba6c33e9 (patch) | |
| tree | 8da9e150c8a73c02e5728d15a2c226af91ea091b /java/sdk_test.go | |
| parent | 2ebae3e9365a5ff55608387917d260aa5a9a31d7 (diff) | |
Create a framework.aidl for non-updatable platform
framework.aidl includes the parcelables from the non-updatable
part of the framework as well as the modules. This causes a
dependency cycle when building module stubs:
module_stub -> module_sdk -> framework.aidl -> public_sdk -> module_stub
The module_sdk only includes the the stubs for the non-updatable
part of the framework, so it should also only contain the non-updatable
parcelables. This change creates a framework_non_updatable.aidl with
those parcelables, and updates module_current to use that.
Bug: 144149403
Test: m
Test: m && diff out/soong/framework{,_non_updatable}.aidl
(the diff contains just TestApi + module parcelables)
Change-Id: I224117a0ff695c22d4a4317a51a9b775ed73066b
Merged-In: I224117a0ff695c22d4a4317a51a9b775ed73066b
(cherry picked from commit 85c151c3f3aa64c140524de23493c39ea5822292)
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index fb8646313..52d2df552 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -252,7 +252,7 @@ func TestClasspath(t *testing.T) { bootclasspath: []string{"android_module_lib_stubs_current", "core-lambda-stubs"}, system: "core-current-stubs-system-modules", java9classpath: []string{"android_module_lib_stubs_current"}, - aidl: "-p" + buildDir + "/framework.aidl", + aidl: "-p" + buildDir + "/framework_non_updatable.aidl", }, { name: "system_server_current", |