diff options
| author | Ying Wang <wangying@google.com> | 2014-06-09 21:51:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 21:51:01 +0000 |
| commit | fe9ad0975ade10219a5fa9a77d034ba77735e393 (patch) | |
| tree | f871615c7b08aa90562e2e0fdfe8405097855894 /core/config.mk | |
| parent | 5c2225c592da49855dbc665edb9f03c18deddb78 (diff) | |
| parent | b1f65358a8af7548dfb02de281b081fc356881b4 (diff) | |
| download | build-fe9ad0975ade10219a5fa9a77d034ba77735e393.zip build-fe9ad0975ade10219a5fa9a77d034ba77735e393.tar.gz build-fe9ad0975ade10219a5fa9a77d034ba77735e393.tar.bz2 | |
am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit 'b1f65358a8af7548dfb02de281b081fc356881b4':
Support .asm being compiled by yasm targeted for x86.
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 7e86126..5982ff4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -367,6 +367,8 @@ BISON_PKGDATADIR := $(PWD)/external/bison/data BISON := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bison/bison YACC := $(BISON) -d +YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm + DOXYGEN:= doxygen AAPT := $(HOST_OUT_EXECUTABLES)/aapt$(HOST_EXECUTABLE_SUFFIX) AIDL := $(HOST_OUT_EXECUTABLES)/aidl$(HOST_EXECUTABLE_SUFFIX) |