Merge AOSP android-9.0.0_r3
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
This commit is contained in:
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \
|
||||
LOCAL_SHARED_LIBRARIES := libc
|
||||
LOCAL_CFLAGS += -D_USING_BIONIC_
|
||||
LOCAL_CFLAGS += -DUSE_ANDROID_RETVALS
|
||||
LOCAL_CFLAGS += -Wno-sign-compare
|
||||
LOCAL_MODULE = fsck.fat
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
|
||||
@@ -35,6 +36,7 @@ LOCAL_SRC_FILES := \
|
||||
LOCAL_C_INCLUDES += bionic/libc/kernel/common
|
||||
LOCAL_SHARED_LIBRARIES := libc
|
||||
LOCAL_CFLAGS += -D_USING_BIONIC_
|
||||
LOCAL_CFLAGS += -Wno-sign-compare
|
||||
LOCAL_MODULE = fatlabel
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
|
||||
@@ -46,6 +48,7 @@ LOCAL_SRC_FILES := src/mkfs.fat.c
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libc
|
||||
LOCAL_CFLAGS += -D_USING_BIONIC_
|
||||
LOCAL_CFLAGS += -Wno-sign-compare
|
||||
LOCAL_MODULE = mkfs.fat
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
|
||||
|
||||
Reference in New Issue
Block a user