diff options
| author | Yiwei Zhang <zzyiwei@chromium.org> | 2021-10-07 18:46:49 +0000 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-10-09 00:42:32 +0000 |
| commit | 2881b43d2c3253d43c53d1c2c83638fb6eae95b9 (patch) | |
| tree | 41939a402531e4160c218971973fcca8236606d7 /bin | |
| parent | 8ebf0d1105ed8c7860e65094708556ace7b394bf (diff) | |
android_stub: update platform headers to include atrace
1. Add tracing headers
2. Update to reflect relocated headers
3. Remove redundant apex/window.h
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13255>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/update-android-headers.sh | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/bin/update-android-headers.sh b/bin/update-android-headers.sh index eddb1cf9c9f..565f32e1a33 100755 --- a/bin/update-android-headers.sh +++ b/bin/update-android-headers.sh @@ -8,9 +8,11 @@ if [ ! -e .git ]; then fi if [ ! -d platform-hardware-libhardware ]; then + git clone --depth 1 https://android.googlesource.com/platform/frameworks/native platform-frameworks-native git clone --depth 1 https://android.googlesource.com/platform/hardware/libhardware platform-hardware-libhardware git clone --depth 1 https://android.googlesource.com/platform/system/core platform-system-core - git clone --depth 1 https://android.googlesource.com/platform/frameworks/native platform-frameworks-native + git clone --depth 1 https://android.googlesource.com/platform/system/logging platform-system-logging + git clone --depth 1 https://android.googlesource.com/platform/system/unwinding platform-system-unwinding fi dest=include/android_stub @@ -25,14 +27,14 @@ mkdir ${dest} # These directories contains mostly only the files we need, so copy wholesale -cp -av platform-frameworks-native/libs/nativewindow/include/vndk \ - platform-system-core/libsync/include/sync \ +cp -av \ + platform-frameworks-native/libs/nativewindow/include/vndk \ + platform-frameworks-native/libs/nativebase/include/nativebase \ platform-system-core/libsync/include/ndk \ - platform-system-core/libbacktrace/include/backtrace \ + platform-system-core/libsync/include/sync \ platform-system-core/libsystem/include/system \ - platform-system-core/liblog/include/log \ - platform-frameworks-native/libs/nativewindow/include/apex \ - platform-frameworks-native/libs/nativebase/include/nativebase \ + platform-system-logging/liblog/include/log \ + platform-system-unwinding/libbacktrace/include/backtrace \ ${dest} @@ -43,15 +45,16 @@ cp -av platform-hardware-libhardware/include/hardware/{hardware,gralloc,gralloc1 cp -av platform-frameworks-native/vulkan/include/hardware/hwvulkan.h ${dest}/hardware mkdir ${dest}/cutils -cp -av platform-system-core/libcutils/include/cutils/{log,native_handle,properties}.h ${dest}/cutils +cp -av platform-system-core/libcutils/include/cutils/{compiler,log,native_handle,properties,trace}.h ${dest}/cutils # include/android has files from a few different projects mkdir ${dest}/android -cp -av platform-frameworks-native/libs/nativewindow/include/android/* \ +cp -av \ + platform-frameworks-native/libs/nativewindow/include/android/* \ platform-frameworks-native/libs/arect/include/android/* \ - platform-system-core/liblog/include/android/* \ platform-system-core/libsync/include/android/* \ + platform-system-logging/liblog/include/android/* \ ${dest}/android |