| commit | 52761aa5e3fdab85ffa7b5f414d109bb2252403c | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Jul 17 19:22:28 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 17 19:22:28 2019 -0700 |
| tree | cc17ace1b67edc98b2d53e861fb555839e3dbc33 | |
| parent | f2c889ff6037ad45043fb923061e5400cc950b19 [diff] | |
| parent | 1c1a28dd0acdf4d2cb28b19b760a8715ec49ba51 [diff] |
Merge "libbinder: don't export private ParcelValTypes.h" am: 31d204ce1f am: 1c1a28dd0a Change-Id: Id66a9af76c30d78c0a863189d0f5e1aa65815f75
diff --git a/libs/binder/include/private/binder/ParcelValTypes.h b/libs/binder/ParcelValTypes.h similarity index 100% rename from libs/binder/include/private/binder/ParcelValTypes.h rename to libs/binder/ParcelValTypes.h
diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index c0aec0a..97a6c94 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp
@@ -17,7 +17,6 @@ #define LOG_TAG "PersistableBundle" #include <binder/PersistableBundle.h> -#include <private/binder/ParcelValTypes.h> #include <limits> @@ -26,6 +25,8 @@ #include <log/log.h> #include <utils/Errors.h> +#include "ParcelValTypes.h" + using android::BAD_TYPE; using android::BAD_VALUE; using android::NO_ERROR;