Merge "Rename 32-bit NDK window package to have -x86 suffix"
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk
index e6710f2..ebdf15b 100644
--- a/build/core/build-binary.mk
+++ b/build/core/build-binary.mk
@@ -46,7 +46,7 @@
$(cleantarget): PRIVATE_CLEAN_FILES := $(LOCAL_BUILT_MODULE) \
$($(my)OBJS)
else
-$(cleantarget): PRIVATE_CLEAN_FILES := ($(my)OBJS)
+$(cleantarget): PRIVATE_CLEAN_FILES := $($(my)OBJS)
endif
$(cleantarget)::
@$(HOST_ECHO) "Clean: $(PRIVATE_MODULE) $(PRIVATE_TEXT)"
diff --git a/build/core/definitions.mk b/build/core/definitions.mk
index 8d4c687..b9d4d46 100644
--- a/build/core/definitions.mk
+++ b/build/core/definitions.mk
@@ -396,6 +396,7 @@
FILTER_ASM \
CPP_FEATURES \
SHORT_COMMANDS \
+ BUILT_MODULE_NOT_COPIED \
# The following are generated by the build scripts themselves
diff --git a/ndk-build b/ndk-build
index a1d8e9e..95520f5 100755
--- a/ndk-build
+++ b/ndk-build
@@ -317,7 +317,7 @@
--use-analyzer $PROGDIR/toolchains/llvm-${DEFAULT_LLVM_VERSION}/prebuilt/$HOST_TAG/bin/${ABI}/analyzer \
--use-cc ${TOOLCHAIN_PREFIX}gcc \
--use-c++ ${TOOLCHAIN_PREFIX}g++ \
- --status-bugs -v -v \
+ --status-bugs \
$GNUMAKE -f $PROGDIR/build/core/build-local.mk "$@" APP_ABI=$ABI
done
else
diff --git a/sources/cxx-stl/gabi++/include/unwind-arm.h b/sources/cxx-stl/gabi++/include/unwind-arm.h
index fff204b..d3f697e 100644
--- a/sources/cxx-stl/gabi++/include/unwind-arm.h
+++ b/sources/cxx-stl/gabi++/include/unwind-arm.h
@@ -56,7 +56,7 @@
typedef struct _Unwind_Context _Unwind_Context;
typedef uint32_t _Unwind_EHT_Header;
-typedef struct _Unwind_Control_Block {
+struct _Unwind_Control_Block {
uint64_t exception_class; // Compatible with Itanium ABI
void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block*);
@@ -85,7 +85,7 @@
} pr_cache;
long long int : 0; // Force alignment of next item to 8-byte boundary
-} _Unwind_Control_Block;
+};
// This makes our code more simple
typedef _Unwind_Control_Block _Unwind_Exception;
