aboutsummaryrefslogtreecommitdiffstats
path: root/sysprop
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-04-18 10:56:44 -0700
committerColin Cross <ccross@android.com>2019-04-22 10:08:35 -0700
commit9bdfaf059105ab75bd4ca99629ce02659fe850fd (patch)
tree22fbda0cf84fd9bf45260b612e8a3039022f0e0c /sysprop
parent31174703be8d659cd5ab78fb465ac16b4e493713 (diff)
downloadbuild_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.gz
build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.tar.bz2
build_soong-9bdfaf059105ab75bd4ca99629ce02659fe850fd.zip
Build framework.aidl in Soong
Move the rules to build framework.aidl into Soong, and use it when compiling aidl files with sdk_version: "current". Also fixes incorrectly using the aidl includes exported by the "framework" module when the proguardRaiseDep dependency was added. Bug: 130798034 Test: sdk_test.go Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337 Merged-In: I126adf1d9e7b6acb528875ff62b974ba7ad9a337 (cherry picked from commit 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b)
Diffstat (limited to 'sysprop')
-rw-r--r--sysprop/sysprop_test.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index a7aff59e..07406b3c 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -106,6 +106,7 @@ func testContext(config android.Config, bp string,
"api/system-removed.txt": nil,
"api/test-current.txt": nil,
"api/test-removed.txt": nil,
+ "framework/aidl/a.aidl": nil,
"prebuilts/sdk/current/core/android.jar": nil,
"prebuilts/sdk/current/public/android.jar": nil,