commit ba5e591e2d595e5b361e749ec133de1f339bcdd5
author Yang Ni <yangni@google.com> Tue Dec 13 16:58:02 2016 -0800
committer Yang Ni <yangni@google.com> Tue Dec 13 17:23:40 2016 -0800
tree 5db9bc1e71336d830b1e270c565b79fdfc61bd97
parent 88229baafb6e7be997f4e9fa4a8ccf39c45a06cc

Avoid dependency on androidfw

Bug: http://b/33451638

Test: mm

Change-Id: If3c311cae06fc60d7ab7ebf2b14539be3503ef2b

Android.mk

diff --git a/Android.mk b/Android.mk
index 8a59f24..e7c847d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,9 +23,6 @@
 endif
 
 rs_base_CFLAGS := -Werror -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -fno-exceptions -std=c++11
-ifeq ($(TARGET_BUILD_PDK), true)
-  rs_base_CFLAGS += -D__RS_PDK__
-endif
 
 ifneq ($(OVERRIDE_RS_DRIVER),)
   rs_base_CFLAGS += -DOVERRIDE_RS_DRIVER=$(OVERRIDE_RS_DRIVER)
@@ -190,7 +187,7 @@
 
 LOCAL_SHARED_LIBRARIES += liblog libcutils libutils libEGL libGLESv1_CM libGLESv2
 LOCAL_SHARED_LIBRARIES += libgui libsync libdl libui
-LOCAL_SHARED_LIBRARIES += libft2 libpng libz libandroidfw
+LOCAL_SHARED_LIBRARIES += libft2 libpng libz
 
 LOCAL_SHARED_LIBRARIES += libbcinfo
 
@@ -367,7 +364,7 @@
 	rsThreadIO.cpp \
 	rsType.cpp
 
-LOCAL_STATIC_LIBRARIES := libcutils libutils liblog libandroidfw
+LOCAL_STATIC_LIBRARIES := libcutils libutils liblog
 
 LOCAL_CLANG := true
 

rsApiFileA3D.cpp

diff --git a/rsApiFileA3D.cpp b/rsApiFileA3D.cpp
index a96dd11..50de3b2 100644
--- a/rsApiFileA3D.cpp
+++ b/rsApiFileA3D.cpp
@@ -83,17 +83,8 @@
 }
 
 RsFile rsaFileA3DCreateFromAsset(RsContext con, void *_asset) {
-#if !defined(__RS_PDK__)
-    Context *rsc = static_cast<Context *>(con);
-    Asset *asset = static_cast<Asset *>(_asset);
-    FileA3D *fa3d = new FileA3D(rsc);
-    fa3d->incUserRef();
-
-    fa3d->load(asset);
-    return fa3d;
-#else
+    ALOGE("Calling deprecated %s API", __FUNCTION__);
     return nullptr;
-#endif
 }
 
 RsFile rsaFileA3DCreateFromFile(RsContext con, const char *path) {

rsFileA3D.cpp

diff --git a/rsFileA3D.cpp b/rsFileA3D.cpp
index 07dd340..1906c4c 100644
--- a/rsFileA3D.cpp
+++ b/rsFileA3D.cpp
@@ -22,10 +22,6 @@
 #include "rsAnimation.h"
 #include "rs.h"
 
-#if !defined(__RS_PDK__)
-    #include <androidfw/Asset.h>
-#endif
-
 #include <inttypes.h>
 
 namespace android {
@@ -36,7 +32,6 @@
     mData = nullptr;
     mWriteStream = nullptr;
     mReadStream = nullptr;
-    mAsset = nullptr;
 
     mMajorVersion = 0;
     mMinorVersion = 1;
@@ -59,11 +54,6 @@
     if (mAlloc) {
         free(mAlloc);
     }
-    if (mAsset) {
-#if !defined(__RS_PDK__)
-        delete mAsset;
-#endif
-    }
 }
 
 void FileA3D::parseHeader(IStream *headerStream) {
@@ -92,12 +82,7 @@
 }
 
 bool FileA3D::load(Asset *asset) {
-#if !defined(__RS_PDK__)
-    mAsset = asset;
-    return load(asset->getBuffer(false), asset->getLength());
-#else
     return false;
-#endif
 }
 
 bool FileA3D::load(const void *data, size_t length) {

rsFileA3D.h

diff --git a/rsFileA3D.h b/rsFileA3D.h
index ae74455..bb272e6 100644
--- a/rsFileA3D.h
+++ b/rsFileA3D.h
@@ -85,7 +85,6 @@
     const uint8_t * mData;
     void * mAlloc;
     uint64_t mDataSize;
-    Asset *mAsset;
 
     OStream *mWriteStream;
     Vector<A3DIndexEntry*> mWriteIndex;