From 27eecb99d22b7d8aa1e345f0bbcd37f839c8a92f Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 21 Jun 2018 13:47:17 +0900 Subject: Add api_dirs property and use module name as prefix The soong connect the prebuilt library according to LOCAL_SDK_VERSION. But some sdk libraries has diffrent version policy with LOCAL_SDK_VERSION. For this, we need to support direct link to the prebuilt library instead of creating a new LOCAL_XXX_SDK_VERSION. So, The base module name is used as the prefix for the prebuilt module name. Remove the empty file check to support the absence of a prebuilt library and add api_dirs property Bug:77577799 Test: make -j Change-Id: I1086977d26e4ddfd62e290637126d44e1b248bac --- java/java_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 96bf22436..572db2f79 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -188,7 +188,7 @@ func testContext(config android.Config, bp string, "prebuilts/sdk/28/system/api/bar-removed.txt": nil, "prebuilts/sdk/28/test/api/bar-removed.txt": nil, "prebuilts/sdk/tools/core-lambda-stubs.jar": nil, - "prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "prebuilt_apis",}`), + "prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "current"],}`), // For framework-res, which is an implicit dependency for framework "AndroidManifest.xml": nil, -- cgit v1.2.3-59-g8ed1b