Project import generated by Copybara. GitOrigin-RevId: 1039833da42bdc1a352ddd8eba6df58aa9125ac7
diff --git a/CleanSpec.mk b/CleanSpec.mk deleted file mode 100644 index 73b00da..0000000 --- a/CleanSpec.mk +++ /dev/null
@@ -1,50 +0,0 @@ -# Copyright (C) 2007 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# If you don't need to do a full clean build but would like to touch -# a file or delete some intermediate files, add a clean step to the end -# of the list. These steps will only be run once, if they haven't been -# run before. -# -# E.g.: -# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) -# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) -# -# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with -# files that are missing or have been moved. -# -# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. -# Use $(OUT_DIR) to refer to the "out" directory. -# -# If you need to re-do something that's already mentioned, just copy -# the command and add it to the bottom of the list. E.g., if a change -# that you made last week required touching a file and a change you -# made today requires touching the same file, just copy the old -# touch step and add it to the end of the list. -# -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ - -# For example: -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) -#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) -#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) - -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libopencflite_intermediates)
diff --git a/CoreFoundation/Android.mk b/CoreFoundation/Android.mk index 0349673..95ed517 100644 --- a/CoreFoundation/Android.mk +++ b/CoreFoundation/Android.mk
@@ -56,12 +56,7 @@ CFVersion.c \ CFWindowsMessageQueue.c \ CFXMLPreferencesDomain.c \ -compat/flsl.c \ -compat/strlcat.c - -ifeq ($(TARGET_ARCH), x86-64) -opencflite_src_files += compat/strlcpy.c -endif +compat/flsl.c # disabled for now #CFMachPort.c @@ -78,25 +73,23 @@ LOCAL_SRC_FILES := $(opencflite_src_files) LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_C_INCLUDES += $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/icu/icu4c/source/common/ -LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/icu/icu4c/source/i18n/ -LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/icu/icu4c/source/tools/tzcode/ -LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/opencflite/libBlocksRuntime/ -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include -LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)/.. +LOCAL_C_INCLUDES += external/icu/icu4c/source/common/ +LOCAL_C_INCLUDES += external/icu/icu4c/source/i18n/ +LOCAL_C_INCLUDES += external/icu/icu4c/source/tools/tzcode/ +LOCAL_C_INCLUDES += external/opencflite/libBlocksRuntime/ +LOCAL_CFLAGS = -x c -fblocks -std=gnu99 -Wno-trigraphs -fexceptions -DCF_BUILDING_CF=1 -DDISABLE_GCD -nostdlibinc -D__kCFDataDir=\"/etc/opencflite\" $(LOCAL_EXPORT_CFLAGS) -Wno-infinite-recursion -Wno-unused-parameter -Wno-unsequenced -Wno-date-time -Wno-implicit -Wno-tautological-pointer-compare +ifeq ($(TARGET_PRODUCT),iot_cygnus) +LOCAL_CFLAGS += -DDEPLOYMENT_TARGET_LINUX -DDEPLOYMENT_TARGET_ANDROID +else # todo: remove Linux case LOCAL_EXPORT_CFLAGS := -DDEPLOYMENT_TARGET_LINUX -DDEPLOYMENT_TARGET_ANDROID -LOCAL_CFLAGS = -x c -fblocks -std=gnu99 -Wno-trigraphs -fexceptions -U__CONSTANT_CFSTRINGS__ -DCF_BUILDING_CF=1 -DDISABLE_GCD -D__kCFDataDir=\"/etc/opencflite\" $(LOCAL_EXPORT_CFLAGS) -Wno-infinite-recursion -Wno-unused-parameter -Wno-unsequenced -Wno-date-time -Wno-implicit -Wno-tautological-pointer-compare -D_BSD_SOURCE -ifeq ($(TARGET_ARCH), x86-64) -LOCAL_CFLAGS += -D_GNU_SOURCE endif #note: not all flags from MakefileLinux have been ported over. -LOCAL_LDFLAGS := -fpic +LOCAL_LDFLAGS = -fpic LOCAL_SHARED_LIBRARIES += libicuuc libicui18n -LOCAL_REQUIRED_MODULES := CFCharacterSetBitmaps.bitmap include $(BUILD_SHARED_LIBRARY) +ifneq ($(TARGET_PRODUCT),iot_cygnus) include $(CLEAR_VARS) LOCAL_MODULE := libopencflite LOCAL_SRC_FILES := $(opencflite_src_files) @@ -106,20 +99,14 @@ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/icu/icu4c/source/i18n/ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/icu/icu4c/source/tools/tzcode/ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/opencflite/libBlocksRuntime/ -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include -LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)/.. # todo: remove Linux case LOCAL_EXPORT_CFLAGS := -DDEPLOYMENT_TARGET_LINUX -DDEPLOYMENT_TARGET_ANDROID -LOCAL_CFLAGS = -x c -fblocks -std=gnu99 -Wno-trigraphs -fexceptions -U__CONSTANT_CFSTRINGS__ -DCF_BUILDING_CF=1 -DDISABLE_GCD -D__kCFDataDir=\"/etc/opencflite\" $(LOCAL_EXPORT_CFLAGS) -Wno-infinite-recursion -Wno-unused-parameter -Wno-unsequenced -Wno-date-time -Wno-implicit -Wno-tautological-pointer-compare -D_BSD_SOURCE -ifeq ($(TARGET_ARCH), x86-64) -LOCAL_CFLAGS += -D_GNU_SOURCE -endif +LOCAL_CFLAGS = -x c -fblocks -std=gnu99 -Wno-trigraphs -fexceptions -DCF_BUILDING_CF=1 -DDISABLE_GCD -nostdlibinc -D__kCFDataDir=\"/etc/opencflite\" $(LOCAL_EXPORT_CFLAGS) -Wno-infinite-recursion -Wno-unused-parameter -Wno-unsequenced -Wno-date-time -Wno-implicit -Wno-tautological-pointer-compare #note: not all flags from MakefileLinux have been ported over. -LOCAL_LDFLAGS := -fpic +LOCAL_LDFLAGS = -fpic LOCAL_STATIC_LIBRARIES += libicuuc_static libicui18n_static -LOCAL_REQUIRED_MODULES := CFCharacterSetBitmaps.bitmap include $(BUILD_STATIC_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := CFCharacterSetBitmaps.bitmap
diff --git a/CoreFoundation/CFBase.h b/CoreFoundation/CFBase.h index 55df511..55fe89b 100644 --- a/CoreFoundation/CFBase.h +++ b/CoreFoundation/CFBase.h
@@ -79,10 +79,6 @@ #define __private_extern__ #elif defined(__GNUC__) #define weak_import -#if defined(__clang__) -// clang defines __private_extern__ as extern, which is not what we want -#undef __private_extern__ -#endif #define __private_extern__ __attribute__((visibility("hidden"))) #endif
diff --git a/libBlocksRuntime/Android.mk b/libBlocksRuntime/Android.mk index 842a444..9be824a 100644 --- a/libBlocksRuntime/Android.mk +++ b/libBlocksRuntime/Android.mk
@@ -5,11 +5,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := libblocksruntime LOCAL_SRC_FILES := runtime.c data.c -LOCAL_CFLAGS := -DHAVE_CONFIG_H -I. -DBlocksRuntime_EXPORTS -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG -std=c99 -Wall -Wextra -W -pedantic -Wno-unused-parameter -fPIC -DPIC +LOCAL_CFLAGS := -DHAVE_CONFIG_H -I. -DBlocksRuntime_EXPORTS -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG -std=c99 -Wall -Wextra -W -pedantic -Wno-unused-parameter -fPIC -DPIC -nostdlibinc include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libblocksruntime LOCAL_SRC_FILES := runtime.c data.c -LOCAL_CFLAGS := -DHAVE_CONFIG_H -I. -DBlocksRuntime_EXPORTS -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG -std=c99 -Wall -Wextra -W -pedantic -Wno-unused-parameter -fPIC -DPIC +LOCAL_CFLAGS := -DHAVE_CONFIG_H -I. -DBlocksRuntime_EXPORTS -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT -DHAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG -std=c99 -Wall -Wextra -W -pedantic -Wno-unused-parameter -fPIC -DPIC -nostdlibinc include $(BUILD_SHARED_LIBRARY)