Merge "Export static libraries." (fef155c5) · Commits · e / os / android_build_soong

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -435,6 +435,7 @@ toolchain_library {
		src: "prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib/libwinpthread.a",
		},
		},
		notice: "../../prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/licenses/mingw-w64-svn-r5861/mingw-w64-libraries/winpthreads/COPYING",
		}

		toolchain_library {

+4 −3

Original line number	Diff line number	Diff line
		@@ -275,10 +275,11 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod
		if amod.commonProperties.Owner != nil {
		fmt.Fprintln(&data.preamble, "LOCAL_MODULE_OWNER :=", *amod.commonProperties.Owner)
		}
		}

		if amod.commonProperties.Notice != nil {
		fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", "$(LOCAL_PATH)/"+*amod.commonProperties.Notice)
		}
		}

		if host {
		makeOs := amod.Os().String()

+3 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,9 @@ func TestArchConfig(buildDir string, env map[string]string) Config {
		{BuildOs, Arch{ArchType: X86_64}},
		{BuildOs, Arch{ArchType: X86}},
		},
		Windows: []Target{
		{Windows, Arch{ArchType: X86}},
		},
		}

		config.BuildOsVariant = config.Targets[BuildOs][0].String()

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,12 @@ func (c *Module) AndroidMk() android.AndroidMkData {
		if len(c.Properties.AndroidMkSharedLibs) > 0 {
		fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " "))
		}
		if len(c.Properties.AndroidMkStaticLibs) > 0 {
		fmt.Fprintln(w, "LOCAL_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkStaticLibs, " "))
		}
		if len(c.Properties.AndroidMkWholeStaticLibs) > 0 {
		fmt.Fprintln(w, "LOCAL_WHOLE_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkWholeStaticLibs, " "))
		}
		fmt.Fprintln(w, "LOCAL_SOONG_LINK_TYPE :=", c.getMakeLinkType())
		if c.useVndk() {
		fmt.Fprintln(w, "LOCAL_USE_VNDK := true")

+12 −4

Original line number	Diff line number	Diff line
		@@ -177,7 +177,9 @@ type BaseProperties struct {
		Sdk_version *string

		AndroidMkSharedLibs []string `blueprint:"mutated"`
		AndroidMkStaticLibs []string `blueprint:"mutated"`
		AndroidMkRuntimeLibs []string `blueprint:"mutated"`
		AndroidMkWholeStaticLibs []string `blueprint:"mutated"`
		HideFromMake bool `blueprint:"mutated"`
		PreventInstall bool `blueprint:"mutated"`

		@@ -1479,9 +1481,15 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
		// they merely serve as Make dependencies and do not affect this lib itself.
		c.Properties.AndroidMkSharedLibs = append(
		c.Properties.AndroidMkSharedLibs, makeLibName(depName))
		case staticDepTag, staticExportDepTag, lateStaticDepTag:
		c.Properties.AndroidMkStaticLibs = append(
		c.Properties.AndroidMkStaticLibs, makeLibName(depName))
		case runtimeDepTag:
		c.Properties.AndroidMkRuntimeLibs = append(
		c.Properties.AndroidMkRuntimeLibs, makeLibName(depName))
		case wholeStaticDepTag:
		c.Properties.AndroidMkWholeStaticLibs = append(
		c.Properties.AndroidMkWholeStaticLibs, makeLibName(depName))
		}
		})