StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stubs libs are dist artifacts"

Browse Source 
am: 11f12db823

Change-Id: I488a2fd27492e31cba05b28e64ba312b7a51d5a4
This commit is contained in:
android-build-prod (mdb)
2018-05-05 07:17:36 -07:00
committed by android-build-merger
parent 182b37783e 11f12db823
commit e4a2c81ead
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/sdk_library.go
View File

@@ -68,10 +68,9 @@ var (
// //
// TODO: these are big features that are currently missing // TODO: these are big features that are currently missing
// 1) check for API consistency // 1) check for API consistency
// 2) install stubs libs as the dist artifacts // 2) ensuring that apps have appropriate <uses-library> tag
// 3) ensuring that apps have appropriate <uses-library> tag // 3) disallowing linking to the runtime shared lib
// 4) disallowing linking to the runtime shared lib // 4) HTML generation
// 5) HTML generation
func init() { func init() {
android.RegisterModuleType("java_sdk_library", sdkLibraryFactory) android.RegisterModuleType("java_sdk_library", sdkLibraryFactory)
@@ -155,15 +154,25 @@ func (module *sdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
} }
func (module *sdkLibrary) AndroidMk() android.AndroidMkData { func (module *sdkLibrary) AndroidMk() android.AndroidMkData {
// Create a phony module that installs the impl library, for the case when this lib is
// in PRODUCT_PACKAGES.
return android.AndroidMkData{ return android.AndroidMkData{
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
// Create a phony module that installs the impl library, for the case when this lib is
// in PRODUCT_PACKAGES.
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)") fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", name) fmt.Fprintln(w, "LOCAL_MODULE :=", name)
fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+module.implName()) fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+module.implName())
fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
// Create dist rules to install the stubs libs to the dist dir
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.publicApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "public", module.BaseModuleName()+".jar")+")")
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.systemApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "system", module.BaseModuleName()+".jar")+")")
fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+
module.testApiStubsPath.Strings()[0]+
":"+path.Join("apistubs", "test", module.BaseModuleName()+".jar")+")")
}, },
} }
} }