diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 23:17:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 23:17:44 +0000 |
| commit | fc6cd75fc09fdccd4e1dc0b07eebde9af85947c8 (patch) | |
| tree | 46e2fdba7a45c72cc9256e663fb10ba79b205ea3 /core/jni/Android.mk | |
| parent | cfb3185a27efeb9312ddf71f52f3a7039c4694df (diff) | |
| parent | 72e7217d0bd1035fc0c947da5d1e802624774a80 (diff) | |
| download | frameworks_base-fc6cd75fc09fdccd4e1dc0b07eebde9af85947c8.zip frameworks_base-fc6cd75fc09fdccd4e1dc0b07eebde9af85947c8.tar.gz frameworks_base-fc6cd75fc09fdccd4e1dc0b07eebde9af85947c8.tar.bz2 | |
am 72e7217d: am b7121d70: am b78cce6f: Merge "Update autogenerated gl functions."
* commit '72e7217d0bd1035fc0c947da5d1e802624774a80':
Update autogenerated gl functions.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 1dd10e1..28f1a3a 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -5,7 +5,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL LOCAL_CFLAGS += -U__APPLE__ -LOCAL_CFLAGS += -Wno-unused-parameter -Wno-int-to-pointer-cast +LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wno-non-virtual-dtor LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses LOCAL_CPPFLAGS += -Wno-conversion-null |