| commit | 512e24f4418ed33838f694de8968d2efa52897f2 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Mar 19 06:23:33 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 19 06:23:33 2015 +0000 |
| tree | 1d470c68226306912e37126f1db93eaedddb5d35 | |
| parent | 1a9bf268adfa3fc314ea50162609bfaeea5bcba4 [diff] | |
| parent | 483665904fd527b56a257c62e33bafff05e7e4ee [diff] |
Merge "Fix LOCAL_CXX_STL translation (now maps to stl)." into master-soong
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 53ae6b3..48905a7 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go
@@ -20,7 +20,7 @@ "LOCAL_MODULE": "name", "LOCAL_MODULE_STEM": "stem", "LOCAL_MODULE_CLASS": "class", - "LOCAL_CXX_STL": "cxx_stl", + "LOCAL_CXX_STL": "stl", "LOCAL_STRIP_MODULE": "strip", "LOCAL_MULTILIB": "compile_multilib", }