diff options
| author | Mark White <anothermark@google.com> | 2023-07-26 10:41:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-26 10:41:43 +0000 |
| commit | 884c6e83b30677ba6bcebb2137d5f99306fafca8 (patch) | |
| tree | 7d8d264c9caeae59878c9932bceabb59894654b9 | |
| parent | 50060bbd89e455af72b7ce97b17fd879315388b3 (diff) | |
| parent | 5da33583282e48222ab9ab48f593c1551efc8941 (diff) | |
| download | libhardware-884c6e83b30677ba6bcebb2137d5f99306fafca8.tar.gz | |
Merge "Revert "libhardware: make memtrack vendor only"" into main am: 5da3358328
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2675839
Change-Id: Ife4001565aef798eb8b3f00c1083ad5d3572f12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| l--------- | include/hardware/memtrack.h | 1 | ||||
| -rw-r--r-- | include_all/hardware/memtrack.h (renamed from include_vendor/hardware/memtrack.h) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/include/hardware/memtrack.h b/include/hardware/memtrack.h new file mode 120000 index 00000000..3bc44484 --- /dev/null +++ b/include/hardware/memtrack.h @@ -0,0 +1 @@ +../../include_all/hardware/memtrack.h
\ No newline at end of file diff --git a/include_vendor/hardware/memtrack.h b/include_all/hardware/memtrack.h index 57ba4ad7..57ba4ad7 100644 --- a/include_vendor/hardware/memtrack.h +++ b/include_all/hardware/memtrack.h |