Merge "Pixelstats: read other count instead of reset count" into sc-qpr1-dev am: 1f321b5917
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel/+/15818513
Change-Id: I2870e2eb78b71db2aecc3ac647e783235dd7a21f
diff --git a/health/Android.bp b/health/Android.bp
index f06c633..008055a 100644
--- a/health/Android.bp
+++ b/health/Android.bp
@@ -28,12 +28,12 @@
],
export_shared_lib_headers: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"pixelatoms-cpp",
],
shared_libs: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"libbase",
"libbinder_ndk",
"libcutils",
diff --git a/mm/pixel-mm-gki.rc b/mm/pixel-mm-gki.rc
index 06684ff..0566ef4 100644
--- a/mm/pixel-mm-gki.rc
+++ b/mm/pixel-mm-gki.rc
@@ -14,7 +14,6 @@
on init
# memory reserve tuning
- write /proc/sys/vm/watermark_boost_factor 0
write /proc/sys/vm/min_free_kbytes 27386
write /proc/sys/vm/lowmem_reserve_ratio "0 0 0"
# khugepaged tuning
diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp
index 21bb6d8..4f397f7 100644
--- a/pixelstats/Android.bp
+++ b/pixelstats/Android.bp
@@ -75,7 +75,7 @@
"-Werror",
],
shared_libs: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"libbase",
"libbinder_ndk",
"libcutils",
@@ -86,7 +86,7 @@
"pixelatoms-cpp",
],
export_shared_lib_headers: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"pixelatoms-cpp",
],
static_libs: [
diff --git a/power-libperfmgr/Android.bp b/power-libperfmgr/Android.bp
index 9049295..df0a738 100644
--- a/power-libperfmgr/Android.bp
+++ b/power-libperfmgr/Android.bp
@@ -48,7 +48,7 @@
vintf_fragments: ["aidl/android.hardware.power-service.pixel.xml"],
vendor: true,
shared_libs: [
- "android.hardware.power-V2-ndk_platform",
+ "android.hardware.power-V2-ndk",
"libbase",
"libcutils",
"liblog",
@@ -57,7 +57,7 @@
"libdisppower-pixel",
"libperfmgr",
"libprocessgroup",
- "pixel-power-ext-V1-ndk_platform",
+ "pixel-power-ext-V1-ndk",
],
srcs: [
"aidl/service.cpp",
diff --git a/powerstats/Android.bp b/powerstats/Android.bp
index 707f73a..394c07b 100644
--- a/powerstats/Android.bp
+++ b/powerstats/Android.bp
@@ -56,8 +56,8 @@
"libhardware",
"liblog",
"libutils",
- "pixel_stateresidency_provider_aidl_interface-ndk_platform",
- "android.hardware.power.stats-V1-ndk_platform",
+ "pixel_stateresidency_provider_aidl_interface-ndk",
+ "android.hardware.power.stats-V1-ndk",
],
}
diff --git a/thermal/Android.bp b/thermal/Android.bp
index 76f4248..f3551a9 100644
--- a/thermal/Android.bp
+++ b/thermal/Android.bp
@@ -38,8 +38,8 @@
"libbinder_ndk",
"android.hardware.thermal@1.0",
"android.hardware.thermal@2.0",
- "android.hardware.power-V1-ndk_platform",
- "pixel-power-ext-V1-ndk_platform"
+ "android.hardware.power-V1-ndk",
+ "pixel-power-ext-V1-ndk"
],
cflags: [
"-Wall",
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index 2d6d4d4..dff6816 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -37,7 +37,7 @@
name: "PixelVibratorBinaryDefaults",
defaults: ["PixelVibratorDefaults"],
shared_libs: [
- "android.hardware.vibrator-V2-ndk_platform",
+ "android.hardware.vibrator-V2-ndk",
],
}
@@ -45,7 +45,7 @@
name: "PixelVibratorTestDefaults",
defaults: ["PixelVibratorDefaults"],
static_libs: [
- "android.hardware.vibrator-V2-ndk_platform",
+ "android.hardware.vibrator-V2-ndk",
],
test_suites: ["device-tests"],
require_root: true,
