Skip to content

Commit a982dc0

Browse files
committed
frameworks/base: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
1 parent 54c5462 commit a982dc0

File tree

14 files changed

+8
-1794
lines changed

14 files changed

+8
-1794
lines changed

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <android_runtime/AndroidRuntime.h>
2121

2222
#include <utils/Log.h>
23+
#include <utils/ZipFileRO.h>
2324
#include <ScopedUtfChars.h>
24-
#include <androidfw/ZipFileRO.h>
2525

2626
#include <zlib.h>
2727

include/androidfw/AssetManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
#include <androidfw/Asset.h>
2424
#include <androidfw/AssetDir.h>
25-
#include <androidfw/ZipFileRO.h>
2625
#include <utils/KeyedVector.h>
2726
#include <utils/SortedVector.h>
2827
#include <utils/String16.h>
2928
#include <utils/String8.h>
3029
#include <utils/threads.h>
3130
#include <utils/Vector.h>
31+
#include <utils/ZipFileRO.h>
3232

3333
/*
3434
* Native-app access is via the opaque typedef struct AAssetManager in the C namespace.

include/androidfw/ZipFileCRO.h

Lines changed: 0 additions & 61 deletions
This file was deleted.

include/androidfw/ZipFileRO.h

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)