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

Merge changes I047d103b,I35de5d93,I3327d275

Browse Source 
* changes:
  Add prebuilts/misc to root.bp
  Export java modules to make
  Fix java prebuilts
This commit is contained in:
Treehugger Robot
2017-08-08 04:38:45 +00:00
committed by Gerrit Code Review
parent 59034511c5 b3af348dc0
commit ec0aca3a84
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/mutator.go
View File

@@ -74,7 +74,7 @@ var preArch = []RegisterMutatorFunc{
func(ctx RegisterMutatorsContext) { func(ctx RegisterMutatorsContext) {
ctx.TopDown("load_hooks", loadHookMutator).Parallel() ctx.TopDown("load_hooks", loadHookMutator).Parallel()
}, },
registerPrebuiltsPreArchMutators, RegisterPrebuiltsPreArchMutators,
RegisterDefaultsPreArchMutators, RegisterDefaultsPreArchMutators,
} }
@@ -86,7 +86,7 @@ var preDeps = []RegisterMutatorFunc{
} }
var postDeps = []RegisterMutatorFunc{ var postDeps = []RegisterMutatorFunc{
registerPrebuiltsPostDepsMutators, RegisterPrebuiltsPostDepsMutators,
} }
func PreArchMutators(f RegisterMutatorFunc) { func PreArchMutators(f RegisterMutatorFunc) {

4
android/prebuilt.go
View File

@@ -61,11 +61,11 @@ type PrebuiltInterface interface {
Prebuilt() *Prebuilt Prebuilt() *Prebuilt
} }
func registerPrebuiltsPreArchMutators(ctx RegisterMutatorsContext) { func RegisterPrebuiltsPreArchMutators(ctx RegisterMutatorsContext) {
ctx.BottomUp("prebuilts", prebuiltMutator).Parallel() ctx.BottomUp("prebuilts", prebuiltMutator).Parallel()
} }
func registerPrebuiltsPostDepsMutators(ctx RegisterMutatorsContext) { func RegisterPrebuiltsPostDepsMutators(ctx RegisterMutatorsContext) {
ctx.TopDown("prebuilt_select", PrebuiltSelectModuleMutator).Parallel() ctx.TopDown("prebuilt_select", PrebuiltSelectModuleMutator).Parallel()
ctx.BottomUp("prebuilt_replace", PrebuiltReplaceMutator).Parallel() ctx.BottomUp("prebuilt_replace", PrebuiltReplaceMutator).Parallel()
} }

4
android/prebuilt_test.go
View File

@@ -123,8 +123,8 @@ func TestPrebuilts(t *testing.T) {
for _, test := range prebuiltsTests { for _, test := range prebuiltsTests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
ctx := NewTestContext() ctx := NewTestContext()
ctx.PreArchMutators(registerPrebuiltsPreArchMutators) ctx.PreArchMutators(RegisterPrebuiltsPreArchMutators)
ctx.PostDepsMutators(registerPrebuiltsPostDepsMutators) ctx.PostDepsMutators(RegisterPrebuiltsPostDepsMutators)
ctx.RegisterModuleType("prebuilt", ModuleFactoryAdaptor(newPrebuiltModule)) ctx.RegisterModuleType("prebuilt", ModuleFactoryAdaptor(newPrebuiltModule))
ctx.RegisterModuleType("source", ModuleFactoryAdaptor(newSourceModule)) ctx.RegisterModuleType("source", ModuleFactoryAdaptor(newSourceModule))
ctx.Register() ctx.Register()

12
java/androidmk.go
View File

@@ -15,21 +15,17 @@
package java package java
import ( import (
"fmt"
"android/soong/android" "android/soong/android"
) )
func (*Library) AndroidMk() (ret android.AndroidMkData, err error) { func (library *Library) AndroidMk() (ret android.AndroidMkData, err error) {
ret.Class = "JAVA_LIBRARIES" ret.Class = "JAVA_LIBRARIES"
// TODO ret.OutputFile = android.OptionalPathForPath(library.outputFile)
err = fmt.Errorf("Not yet implemented")
return return
} }
func (*Prebuilt) AndroidMk() (ret android.AndroidMkData, err error) { func (prebuilt *Prebuilt) AndroidMk() (ret android.AndroidMkData, err error) {
ret.Class = "JAVA_LIBRARIES" ret.Class = "JAVA_LIBRARIES"
// TODO ret.OutputFile = android.OptionalPathForPath(prebuilt.classpathFile)
err = fmt.Errorf("Not yet implemented")
return return
} }

4
java/java.go
View File

@@ -531,6 +531,10 @@ func (j *Prebuilt) Prebuilt() *android.Prebuilt {
return &j.prebuilt return &j.prebuilt
} }
func (j *Prebuilt) Name() string {
return j.prebuilt.Name(j.ModuleBase.Name())
}
func (j *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) {
} }

2
java/java_test.go
View File

@@ -57,6 +57,8 @@ func testJava(t *testing.T, bp string) *android.TestContext {
ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory)) ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory))
ctx.RegisterModuleType("java_prebuilt_library", android.ModuleFactoryAdaptor(PrebuiltFactory)) ctx.RegisterModuleType("java_prebuilt_library", android.ModuleFactoryAdaptor(PrebuiltFactory))
ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory))
ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators)
ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators)
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
ctx.Register() ctx.Register()

1
root.bp
View File

@@ -29,6 +29,7 @@ optional_subdirs = [
"prebuilts/clang/host/linux-x86", "prebuilts/clang/host/linux-x86",
"prebuilts/ndk", "prebuilts/ndk",
"prebuilts/sdk", "prebuilts/sdk",
"prebuilts/misc",
"system/*", "system/*",
"system/hardware/interfaces", "system/hardware/interfaces",
"system/tools/*", "system/tools/*",