Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d5b48367 authored Sep 17, 2016 by Dhruva Krishnamurthy Committed by Michael Bestas Jan 05, 2017

Fix build on MacOS due to use of deprecated APIs using Xcode 8

Change-Id: I99f6e5c2d5e323ae3e7afef6c86d62e34256ad7b

parent 2e148178

tools/aapt/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ LOCAL_MODULE := aapt
		LOCAL_MODULE_HOST_OS := darwin linux windows
		LOCAL_CFLAGS := $(aaptCFlags)
		LOCAL_CPPFLAGS := $(aaptCppFlags)
		LOCAL_CFLAGS_darwin := -Wno-deprecated-declarations
		LOCAL_LDLIBS_darwin := $(aaptHostLdLibs_darwin)
		LOCAL_LDLIBS_linux := $(aaptHostLdLibs_linux)
		LOCAL_SRC_FILES := $(aaptMain)

tools/aapt2/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ hostLdLibs_linux := -lz
		hostLdLibs_darwin := -lz

		cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG
		cFlags_darwin := -D_DARWIN_UNLIMITED_STREAMS
		cFlags_darwin := -D_DARWIN_UNLIMITED_STREAMS -Wno-deprecated-declarations
		cFlags_windows := -Wno-maybe-uninitialized # Incorrectly marking use of Maybe.value() as error.
		cppFlags := -std=c++11 -Wno-missing-field-initializers -fno-exceptions -fno-rtti
		protoIncludes := $(call generated-sources-dir-for,STATIC_LIBRARIES,libaapt2,HOST)