| commit | 85ef6c984f9384744a4de20844ae5e1d3ab6619b | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Jul 17 20:05:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 17 20:05:33 2019 -0700 |
| tree | caeab632d1e80c2f34771dad8f862e0d10aed71e | |
| parent | af67893ad0dfeb8fb450e75b0c1e3e5e858de8a9 [diff] | |
| parent | 2a640d1ea01688674495616f70cdcf53bef85885 [diff] |
Merge "libbinder: don't export private ParcelValTypes.h" am: 31d204ce1f am: 1c1a28dd0a am: 52761aa5e3 am: 2a640d1ea0 Change-Id: I8f50a7a2365b814b61410e222c96e6e1137bad33
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;