From 9cbe677024883be6732a2bdd33f9daf96618ffe4 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Wed, 21 Mar 2018 17:56:39 -0700 Subject: [PATCH] Fix the issue for incorrect logic of "no_framework_libs" Fortunately Android stubs jar generation didn't get affected by this issue since "framework" and "ext" were explicitly added to the "libs" property: https://cs.corp.google.com/aosp-master/frameworks/base/Android.bp?rcl=72fa61b3250529504a9f5dab2e927a0d2e873f58&l=876 Test: m -j android_stubs_current and check the build.ninja to see if addtional "framework" and "lib" are shwon there. Bug: b/70351683 Change-Id: I9f1eec0d7f8baff6361efef064b7a09a5b2d4a58 --- java/droiddoc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/droiddoc.go b/java/droiddoc.go index 2ed52c921..c65911ce3 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -234,7 +234,7 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) { sdkDep := decodeSdkDep(ctx, String(j.properties.Sdk_version)) if sdkDep.useDefaultLibs { ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) - if Bool(j.properties.No_framework_libs) { + if !Bool(j.properties.No_framework_libs) { ctx.AddDependency(ctx.Module(), libTag, []string{"ext", "framework"}...) } } else if sdkDep.useModule {