Merge "Re-unite sources with their headers"

This commit is contained in:
Treehugger Robot
2016-11-04 21:41:01 +00:00
committed by Gerrit Code Review
21 changed files with 23 additions and 31 deletions

View File

@ -49,6 +49,8 @@ LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
LOCAL_SRC_FILES:= $(hostSources)
LOCAL_C_INCLUDES := external/zlib
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_HOST_STATIC_LIBRARY)
@ -71,6 +73,8 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libz
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)

View File

@ -3539,7 +3539,7 @@ ssize_t ResTable::Theme::getAttribute(uint32_t resID, Res_value* outValue,
}
if (pi != NULL) {
if (kDebugTableTheme) {
ALOGI("Desired type index is %zd in avail %zu", t, Res_MAXTYPE + 1);
ALOGI("Desired type index is %u in avail %zu", t, Res_MAXTYPE + 1);
}
if (t <= Res_MAXTYPE) {
const type_info& ti = pi->types[t];

View File

@ -297,7 +297,7 @@ public:
virtual const void* getBuffer(bool wordAligned);
virtual off64_t getLength(void) const { return mUncompressedLen; }
virtual off64_t getRemainingLength(void) const { return mUncompressedLen-mOffset; }
virtual int openFileDescriptor(off64_t* outStart, off64_t* outLength) const { return -1; }
virtual int openFileDescriptor(off64_t* /* outStart */, off64_t* /* outLength */) const { return -1; }
virtual bool isAllocated(void) const { return mBuf != NULL; }
private:

View File

@ -33,17 +33,8 @@
/*
* Native-app access is via the opaque typedef struct AAssetManager in the C namespace.
*/
#ifdef __cplusplus
extern "C" {
#endif
struct AAssetManager { };
#ifdef __cplusplus
};
#endif
/*
* Now the proper C++ android-namespace definitions
*/

View File

@ -124,20 +124,13 @@ private:
/* Flags for this OBB type. */
int32_t mFlags;
/* Whether the file is salted. */
bool mSalted;
/* The encryption salt. */
unsigned char mSalt[8];
const char* mFileName;
size_t mFileSize;
size_t mFooterStart;
unsigned char* mReadBuf;
bool parseObbFile(int fd);
};

View File

@ -30,6 +30,7 @@ struct TypeVariant {
iterator& operator=(const iterator& rhs) {
mTypeVariant = rhs.mTypeVariant;
mIndex = rhs.mIndex;
return *this;
}
bool operator==(const iterator& rhs) const {

View File

@ -24,7 +24,8 @@ LOCAL_SHARED_LIBRARIES += \
libprotobuf-cpp-lite \
libharfbuzz_ng \
libft2 \
libminikin
libminikin \
libandroidfw
ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
LOCAL_SHARED_LIBRARIES += libRS libRScpp

View File

@ -46,7 +46,8 @@ LOCAL_SHARED_LIBRARIES := \
libusbhost \
libexif \
libpiex \
libstagefright_amrnb_common
libstagefright_amrnb_common \
libandroidfw
LOCAL_STATIC_LIBRARIES := \
libstagefright_amrnbenc

View File

@ -20,7 +20,8 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
libskia
libskia \
libandroidfw
LOCAL_C_INCLUDES += \
frameworks/base/native/include \

View File

@ -73,7 +73,7 @@ LOCAL_MODULE := libsplit-select
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_SRC_FILES := $(sources)
LOCAL_STATIC_LIBRARIES := $(hostStaticLibs)
LOCAL_C_INCLUDES := $(cIncludes)
LOCAL_CFLAGS := $(cFlags) -D_DARWIN_UNLIMITED_STREAMS