From ab6d165763f27a315100e398e0b6c40f619ce366 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 19 Aug 2019 15:24:49 +0900 Subject: Cut the dependency to framework from droiddoc modules droiddoc modules for the SDK API documentation and stubs library generations have depended on the 'framework' (which was recently changed to framework-minus-apex' module to get the list of Java source files to be processed. This however caused a circular dependency when we tried to modularize some classes in the framework library as a separate library. The separate java library depended on the stubs library (because it should only use SDK APIs) and the stubs library depended on the framework library. The framework library itself depended on the separated library (or its stub) to use APIs from the separated library, thus forming a circular dependency. This change fixes the problem by directly giving the framework source files via a filegroup `framework-sources-to-document` where all Java and AIDL files that are to be documented are included in. This change also put the generated R.java and Manifest.java files from framework-res into the filegroup for framework sources. Bug: 70046217 Bug: 135922046 Test: m Exempt-From-Owner-Approval: Approved internally Merged-In: I09ad88da47540d31ad089aad5e1151a4b6877ec2 (cherry picked from commit 20426538f85098552f52dffb40d0f7ffff7946d4) Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2 --- location/lib/Android.bp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'location/lib/Android.bp') diff --git a/location/lib/Android.bp b/location/lib/Android.bp index 1bf5221b1dc1..349b9e063784 100644 --- a/location/lib/Android.bp +++ b/location/lib/Android.bp @@ -16,10 +16,9 @@ java_sdk_library { name: "com.android.location.provider", - srcs: ["java/**/*.java"], + srcs: [ + "java/**/*.java", + ":framework-srcs", + ], api_packages: ["com.android.location.provider"], - srcs_lib: "framework", - // TODO(b/70046217): remove core/java and android below. It was added to provide definitions for - // types like android.os.Bundle - srcs_lib_whitelist_pkgs: ["android", "com.android.internal.location"], } -- cgit v1.2.3-59-g8ed1b