| commit | 48b7ba25a15a9eae83d366c02475539725d035d0 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Thu Jul 24 20:59:34 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 24 20:55:36 2014 +0000 |
| tree | 27795ce9e3e00deead7326445f51790c93d3b087 | |
| parent | 60158365322e6284862363089208284d9a6208e1 [diff] | |
| parent | a36a80903ba991d8cae5f581168f34fdfc0d4518 [diff] |
Merge "Switch to integrated assembler for Darwin."
diff --git a/Android.mk b/Android.mk index d923da0..9e7c712 100644 --- a/Android.mk +++ b/Android.mk
@@ -47,11 +47,6 @@ endif endif -ifeq ($(HOST_OS),darwin) -common_CFLAGS += -no-integrated-as -common_ASFLAGS += -no-integrated-as -endif - common_C_INCLUDES += common_COPY_HEADERS_TO := libpng