diff options
| author | Colin Cross <ccross@android.com> | 2015-06-22 17:26:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-06-22 17:26:12 -0700 |
| commit | eb05083e277936d0d5fe5d321da5fa0960d86fad (patch) | |
| tree | a86fee3d02fa1644718f6e2d149a88a9c610a047 /androidbp/cmd/soong.go | |
| parent | 499c094c0905b82faa83530d4b4e644621cc6cf3 (diff) | |
| download | build_soong-eb05083e277936d0d5fe5d321da5fa0960d86fad.tar.gz build_soong-eb05083e277936d0d5fe5d321da5fa0960d86fad.tar.bz2 build_soong-eb05083e277936d0d5fe5d321da5fa0960d86fad.zip | |
Fix more androidbp bugs
Don't insert a space when concatentating strings. Lists will already have
a separator, and strings may need to be a single word.
Use valueToString to print individual elements in a list to pick up the
same expression fix from a previous patch.
"static_executable" converts to LOCAL_FORCE_STATIC_EXECUTABLE, not "static".
Add "no_default_compiler_flags" to LOCAL_NO_DEFAULT_COMPILER_FLAGS.
Change-Id: I45c7eb8355ee1b40d7949e1560cc11cc959764b3
Diffstat (limited to 'androidbp/cmd/soong.go')
| -rw-r--r-- | androidbp/cmd/soong.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/androidbp/cmd/soong.go b/androidbp/cmd/soong.go index 2b7d32e4..1f15aac7 100644 --- a/androidbp/cmd/soong.go +++ b/androidbp/cmd/soong.go @@ -51,15 +51,15 @@ var standardProperties = map[string]struct { // ==== BOOL PROPERTIES ==== "host": {"LOCAL_IS_HOST_MODULE", bpparser.Bool}, "clang": {"LOCAL_CLANG", bpparser.Bool}, - "static": {"LOCAL_FORCE_STATIC_EXECUTABLE", bpparser.Bool}, + "static_executable": {"LOCAL_FORCE_STATIC_EXECUTABLE", bpparser.Bool}, "asan": {"LOCAL_ADDRESS_SANITIZER", bpparser.Bool}, "native_coverage": {"LOCAL_NATIVE_COVERAGE", bpparser.Bool}, "nocrt": {"LOCAL_NO_CRT", bpparser.Bool}, "allow_undefined_symbols": {"LOCAL_ALLOW_UNDEFINED_SYMBOLS", bpparser.Bool}, - "rtti": {"LOCAL_RTTI_FLAG", bpparser.Bool}, - "no_standard_libraries": {"LOCAL_NO_STANDARD_LIBRARIES", bpparser.Bool}, - "export_package_resources": {"LOCAL_EXPORT_PACKAGE_RESOURCES", bpparser.Bool}, - "static_executable": {"LOCAL_FORCE_STATIC_EXECUTABLE", bpparser.Bool}, + "rtti": {"LOCAL_RTTI_FLAG", bpparser.Bool}, + "no_standard_libraries": {"LOCAL_NO_STANDARD_LIBRARIES", bpparser.Bool}, + "export_package_resources": {"LOCAL_EXPORT_PACKAGE_RESOURCES", bpparser.Bool}, + "no_default_compiler_flags": {"LOCAL_NO_DEFAULT_COMPILER_FLAGS", bpparser.Bool}, } var rewriteProperties = map[string]struct { |