ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix some clang compilation issues."

Browse source
This commit is contained in:
Dan Albert 2014-09-11 17:17:56 +00:00 • committed by Gerrit Code Review
commit 91baad56f3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastbootd/vendor_trigger_default.c
View file

@ -52,7 +52,7 @@ int trigger_gpt_layout(struct GPT_content *table) {
return 0; return 0;
} }
int trigger_oem_cmd(const char *arg, const char **response) { int trigger_oem_cmd(const char *arg, const char **response __unused) {
KLOG_DEBUG("fastbootd", "%s: %s", __func__, arg); KLOG_DEBUG("fastbootd", "%s: %s", __func__, arg);
return 0; return 0;
} }

2
libcutils/Android.mk
View file

@ -151,7 +151,7 @@ LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_C_INCLUDES := $(libcutils_c_includes)
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(targetSmpFlag) -Werror LOCAL_CFLAGS += $(targetSmpFlag) -Werror -std=gnu90
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

4
libpixelflinger/codeflinger/CodeCache.cpp
View file

@ -201,8 +201,8 @@ int CodeCache::cache( const AssemblyKeyBase& keyBase,
mCacheInUse += assemblySize; mCacheInUse += assemblySize;
mWhen++; mWhen++;
// synchronize caches... // synchronize caches...
void* base = assembly->base(); char* base = reinterpret_cast<char*>(assembly->base());
void* curr = (uint8_t*)base + assembly->size(); char* curr = reinterpret_cast<char*>(base + assembly->size());
__builtin___clear_cache(base, curr); __builtin___clear_cache(base, curr);
} }