summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/androidfw/Android.bp7
-rw-r--r--libs/androidfw/CursorWindow.cpp2
-rw-r--r--libs/androidfw/include/androidfw/CursorWindow.h4
3 files changed, 6 insertions, 7 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index 385fbfe1a86a..a39f30bbad1f 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -75,7 +75,6 @@ cc_library {
"BigBufferStream.cpp",
"ChunkIterator.cpp",
"ConfigDescription.cpp",
- "CursorWindow.cpp",
"FileStream.cpp",
"Idmap.cpp",
"LoadedArsc.cpp",
@@ -114,6 +113,7 @@ cc_library {
srcs: [
"BackupData.cpp",
"BackupHelpers.cpp",
+ "CursorWindow.cpp",
],
shared_libs: [
"libbase",
@@ -147,6 +147,11 @@ cc_library {
"libz",
],
},
+ host_linux: {
+ srcs: [
+ "CursorWindow.cpp",
+ ],
+ },
windows: {
enabled: true,
},
diff --git a/libs/androidfw/CursorWindow.cpp b/libs/androidfw/CursorWindow.cpp
index abf2b0a91642..cbb1e8f82838 100644
--- a/libs/androidfw/CursorWindow.cpp
+++ b/libs/androidfw/CursorWindow.cpp
@@ -139,7 +139,6 @@ fail_silent:
return UNKNOWN_ERROR;
}
-#ifdef __linux__
status_t CursorWindow::createFromParcel(Parcel* parcel, CursorWindow** outWindow) {
*outWindow = nullptr;
@@ -241,7 +240,6 @@ fail:
fail_silent:
return UNKNOWN_ERROR;
}
-#endif
status_t CursorWindow::clear() {
if (mReadOnly) {
diff --git a/libs/androidfw/include/androidfw/CursorWindow.h b/libs/androidfw/include/androidfw/CursorWindow.h
index 0996355cd2c4..c2eac12eb77d 100644
--- a/libs/androidfw/include/androidfw/CursorWindow.h
+++ b/libs/androidfw/include/androidfw/CursorWindow.h
@@ -23,9 +23,7 @@
#include <string>
#include "android-base/stringprintf.h"
-#ifdef __linux__
#include "binder/Parcel.h"
-#endif
#include "utils/String8.h"
#include "android-base/mapped_file.h"
@@ -84,11 +82,9 @@ public:
~CursorWindow();
static status_t create(const String8& name, size_t size, CursorWindow** outCursorWindow);
-#ifdef __linux__
static status_t createFromParcel(Parcel* parcel, CursorWindow** outCursorWindow);
status_t writeToParcel(Parcel* parcel);
-#endif
inline String8 name() { return mName; }
inline size_t size() { return mSize; }