| commit | 1c1a28dd0acdf4d2cb28b19b760a8715ec49ba51 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Jul 17 19:02:07 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 17 19:02:07 2019 -0700 |
| tree | 27034aa389f944cb4c574115e43d1237ca45fab6 | |
| parent | 876b1a66753602a7e6372b50a887e0f757aa7ed6 [diff] | |
| parent | 31d204ce1f569b1a26eee43e8dbc73ac1a9c67a3 [diff] |
Merge "libbinder: don't export private ParcelValTypes.h" am: 31d204ce1f Change-Id: Ia347f7b41e32f7c7e6fc8bf06e74abef66585e4d
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;