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

Merge changes I545a832a,I85a51b04 am: 54956abf1f

Browse Source 
am: 2f27762373

Change-Id: Ib0b19484d9e0481c24c2da4f47c56e5d167fe1e1
This commit is contained in:
Colin Cross
2019-02-04 09:57:50 -08:00
committed by android-build-merger
parent 1283de522f 2f27762373
commit dec157bd6c
20 changed files with 57 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -1869,9 +1869,6 @@ type Defaults struct {
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}

9
cc/ndk_headers.go
View File

@@ -93,9 +93,6 @@ type headerModule struct {
licensePath android.ModuleSrcPath
}
func (m *headerModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func getHeaderInstallDir(ctx android.ModuleContext, header android.Path, from string,
to string) android.OutputPath {
// Output path is the sysroot base + "usr/include" + to directory + directory component
@@ -210,9 +207,6 @@ type versionedHeaderModule struct {
licensePath android.ModuleSrcPath
}
func (m *versionedHeaderModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *versionedHeaderModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if String(m.properties.License) == "" {
ctx.PropertyErrorf("license", "field is required")
@@ -335,9 +329,6 @@ type preprocessedHeadersModule struct {
licensePath android.ModuleSrcPath
}
func (m *preprocessedHeadersModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *preprocessedHeadersModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if String(m.properties.License) == "" {
ctx.PropertyErrorf("license", "field is required")