commit 080e3d390ff19ac9e4ea55b4a076f360cb13bd4c
author Suren Baghdasaryan <surenb@google.com> Sun Feb 03 22:28:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 03 22:28:22 2019 +0000
tree a998e8d993f71f3e93561749e5081ddfdc8c2aa0
parent 76f262865411c1c14e19fec7a5dcac3db8102d1d
parent 521133d9d267eb6ea23d8cd4534f20d786e93243

Merge changes from topic "cgroup abstraction layer"

* changes:
  Add libjsoncpp into VNDK
  Add cgroups.json and task_profiles.json build targets

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 422683a..7ad773d 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -49,6 +49,7 @@
     bu \
     bugreport \
     bugreportz \
+    cgroups.json \
     charger \
     cmd \
     com.android.conscrypt \
@@ -246,6 +247,7 @@
     storaged \
     surfaceflinger \
     svc \
+    task_profiles.json \
     tc \
     telecom \
     telephony-common \

target/product/gsi/current.txt

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index c52a379..2716d2c 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -42,6 +42,7 @@
 VNDK-SP: libhwbinder.so
 VNDK-SP: libhwbinder_noltopgo.so
 VNDK-SP: libion.so
+VNDK-SP: libjsoncpp.so
 VNDK-SP: liblzma.so
 VNDK-SP: libprocessgroup.so
 VNDK-SP: libunwindstack.so