Merge changes from topic "linux_glibc"
* changes:
Change androidmk to use linux_glibc instead of linux
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
diff --git a/java/java.go b/java/java.go
index 805e06a..93ab547 100644
--- a/java/java.go
+++ b/java/java.go
@@ -81,10 +81,14 @@
// list of files that should be excluded from java_resources
Exclude_java_resources []string `android:"arch_variant"`
- // don't build against the default libraries (legacy-test, core-junit,
+ // don't build against the default libraries (bootclasspath, legacy-test, core-junit,
// ext, and framework for device targets)
No_standard_libs *bool
+ // don't build against the framework libraries (legacy-test, core-junit,
+ // ext, and framework for device targets)
+ No_framework_libs *bool
+
// list of module-specific flags that will be used for javac compiles
Javacflags []string `android:"arch_variant"`
@@ -262,7 +266,9 @@
sdkDep := decodeSdkDep(ctx, j.deviceProperties.Sdk_version)
if sdkDep.useDefaultLibs {
ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...)
- ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...)
+ if !proptools.Bool(j.properties.No_framework_libs) {
+ ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...)
+ }
}
if sdkDep.useModule {
ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module)
diff --git a/python/binary.go b/python/binary.go
index 91b7a54..b7b5056 100644
--- a/python/binary.go
+++ b/python/binary.go
@@ -162,7 +162,7 @@
var interp string
switch actual_version {
case pyVersion2:
- interp = "python2"
+ interp = "python2.7"
case pyVersion3:
interp = "python3"
default: