Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 946d11d2 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Re-unite sources with their headers" 

am: e43444a0

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
parents 2fe13541 e43444a0

libs/androidfw/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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];

include/androidfw/Asset.h→libs/androidfw/include/androidfw/Asset.h

+4 −4
Original line number Diff line number Diff line
@@ -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:

include/androidfw/AssetManager.h→libs/androidfw/include/androidfw/AssetManager.h

+6 −15
Original line number Diff line number Diff line
@@ -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

 */