diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 17:44:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 17:44:54 +0000 |
| commit | 541b1d0f7c4e77399b468758af4b77eb60c549f9 (patch) | |
| tree | ef337e89f8b0e7c02ba9d7340408ad9aba4b3367 /core/config.mk | |
| parent | 7d883401c040a668bed57fc3a659450fbdaa1d7d (diff) | |
| parent | fe9ad0975ade10219a5fa9a77d034ba77735e393 (diff) | |
| download | build-541b1d0f7c4e77399b468758af4b77eb60c549f9.zip build-541b1d0f7c4e77399b468758af4b77eb60c549f9.tar.gz build-541b1d0f7c4e77399b468758af4b77eb60c549f9.tar.bz2 | |
am fe9ad097: am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86."
* commit 'fe9ad0975ade10219a5fa9a77d034ba77735e393':
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 bcea260..d56f1f8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -366,6 +366,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) |