diff options
| author | Colin Cross <ccross@android.com> | 2017-05-01 17:37:24 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-05-05 18:22:30 -0700 |
| commit | 2a252bef50fc3f0426c55c7524bb193b9afabc4a (patch) | |
| tree | edcaad7ed94518574cff5bd0dfa87fc2cc2131b7 /androidmk | |
| parent | 7e0eaf15b9eec975e45f9e5a27294a0bf0ef9beb (diff) | |
| download | build_soong-2a252bef50fc3f0426c55c7524bb193b9afabc4a.tar.gz build_soong-2a252bef50fc3f0426c55c7524bb193b9afabc4a.tar.bz2 build_soong-2a252bef50fc3f0426c55c7524bb193b9afabc4a.zip | |
Support .rs and .fs files in cc_* module srcs lists
Translate .rs and .fs files to .cpp files using llvm-rs-cc.
Test: builds
Change-Id: I242cea0d09c9985730a512cec7705c3f1479f4ed
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index bd9d8ee0..82c5dac4 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -56,20 +56,21 @@ func addStandardProperties(propertyType bpparser.Type, properties map[string]str func init() { addStandardProperties(bpparser.StringType, map[string]string{ - "LOCAL_MODULE": "name", - "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", - "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", - "LOCAL_MODULE_OWNER": "owner", + "LOCAL_MODULE": "name", + "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", + "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", + "LOCAL_MODULE_OWNER": "owner", + "LOCAL_RENDERSCRIPT_TARGET_API": "renderscript.target_api", }) addStandardProperties(bpparser.ListType, map[string]string{ @@ -96,7 +97,9 @@ func init() { "LOCAL_INIT_RC": "init_rc", "LOCAL_TIDY_FLAGS": "tidy_flags", // TODO: This is comma-separated, not space-separated - "LOCAL_TIDY_CHECKS": "tidy_checks", + "LOCAL_TIDY_CHECKS": "tidy_checks", + "LOCAL_RENDERSCRIPT_INCLUDES": "renderscript.include_dirs", + "LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags", "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs", "LOCAL_JAVACFLAGS": "javacflags", |