From 4ff85ebeb782a08ffeaefb8fbcdd678e89aec87f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 14 Dec 2018 11:47:19 -0800 Subject: Revert "Dexpreopt soong modules inside soong" This reverts commit 29ff88741e710b05743dcf347484c31311e81cda. Test: none Bug: 119412419 --- java/sdk_library.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 877abe489..fdbf19d20 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -141,9 +141,8 @@ type sdkLibrary struct { android.ModuleBase android.DefaultableModuleBase - properties sdkLibraryProperties - deviceProperties CompilerDeviceProperties - dexpreoptProperties DexpreoptProperties + properties sdkLibraryProperties + deviceProperties CompilerDeviceProperties publicApiStubsPath android.Paths systemApiStubsPath android.Paths @@ -565,7 +564,6 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext) Errorprone struct { Javacflags []string } - IsSDKLibrary bool }{} props.Name = proptools.StringPtr(module.implName()) @@ -576,7 +574,6 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext) // XML file is installed along with the impl lib props.Required = []string{module.xmlFileName()} props.Errorprone.Javacflags = module.properties.Errorprone.Javacflags - props.IsSDKLibrary = true if module.SocSpecific() { props.Soc_specific = proptools.BoolPtr(true) @@ -586,10 +583,7 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext) props.Product_specific = proptools.BoolPtr(true) } - mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory), - &props, - &module.deviceProperties, - &module.dexpreoptProperties) + mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory), &props, &module.deviceProperties) } // Creates the xml file that publicizes the runtime library @@ -722,7 +716,6 @@ func sdkLibraryFactory() android.Module { module := &sdkLibrary{} module.AddProperties(&module.properties) module.AddProperties(&module.deviceProperties) - module.AddProperties(&module.dexpreoptProperties) InitJavaModule(module, android.DeviceSupported) return module } -- cgit v1.2.3-59-g8ed1b