aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-04-21 17:37:37 -0700
committerColin Cross <ccross@android.com>2015-04-21 17:37:37 -0700
commit41c187b3d4931b24d08de1fda455cb3d401327e6 (patch)
tree0951b0bc5af3d964ddd14f117b3e30dfdc1675d8 /androidmk
parent30e076af2e4337b79be3ed0872a62578a2524929 (diff)
downloadbuild_soong-41c187b3d4931b24d08de1fda455cb3d401327e6.tar.gz
build_soong-41c187b3d4931b24d08de1fda455cb3d401327e6.tar.bz2
build_soong-41c187b3d4931b24d08de1fda455cb3d401327e6.zip
Support relative_install_path for cc modules
Support specifying an install path relative to the default install path for cc libraries and binaries. Change-Id: I47a97de9beaedde27d99c498c3f26c9d36358d94
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go27
1 files changed, 14 insertions, 13 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 934ea0c8..80384730 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -11,19 +11,20 @@ const (
)
var stringProperties = map[string]string{
- "LOCAL_MODULE": "name",
- "LOCAL_MODULE_STEM": "stem",
- "LOCAL_MODULE_CLASS": "class",
- "LOCAL_CXX_STL": "stl",
- "LOCAL_STRIP_MODULE": "strip",
- "LOCAL_MULTILIB": "compile_multilib",
- "LOCAL_ARM_MODE_HACK": "instruction_set",
- "LOCAL_SDK_VERSION": "sdk_version",
- "LOCAL_NDK_STL_VARIANT": "stl",
- "LOCAL_JAR_MANIFEST": "manifest",
- "LOCAL_JARJAR_RULES": "jarjar_rules",
- "LOCAL_CERTIFICATE": "certificate",
- "LOCAL_PACKAGE_NAME": "name",
+ "LOCAL_MODULE": "name",
+ "LOCAL_MODULE_STEM": "stem",
+ "LOCAL_MODULE_CLASS": "class",
+ "LOCAL_CXX_STL": "stl",
+ "LOCAL_STRIP_MODULE": "strip",
+ "LOCAL_MULTILIB": "compile_multilib",
+ "LOCAL_ARM_MODE_HACK": "instruction_set",
+ "LOCAL_SDK_VERSION": "sdk_version",
+ "LOCAL_NDK_STL_VARIANT": "stl",
+ "LOCAL_JAR_MANIFEST": "manifest",
+ "LOCAL_JARJAR_RULES": "jarjar_rules",
+ "LOCAL_CERTIFICATE": "certificate",
+ "LOCAL_PACKAGE_NAME": "name",
+ "LOCAL_MODULE_RELATIVE_PATH": "relative_install_path",
}
var listProperties = map[string]string{