diff --git a/libprocessgroup/profiles/Android.bp b/libprocessgroup/profiles/Android.bp new file mode 100644 index 000000000..9ed31b026 --- /dev/null +++ b/libprocessgroup/profiles/Android.bp @@ -0,0 +1,30 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +prebuilt_etc { + name: "cgroups.json", + src: "cgroups.json", +} + +prebuilt_etc { + name: "cgroups.recovery.json", + filename: "cgroups.json", + recovery: true, + src: "cgroups.recovery.json", +} + +prebuilt_etc { + name: "task_profiles.json", + src: "task_profiles.json", +} diff --git a/rootdir/cgroups.json b/libprocessgroup/profiles/cgroups.json similarity index 100% rename from rootdir/cgroups.json rename to libprocessgroup/profiles/cgroups.json diff --git a/rootdir/cgroups.recovery.json b/libprocessgroup/profiles/cgroups.recovery.json similarity index 100% rename from rootdir/cgroups.recovery.json rename to libprocessgroup/profiles/cgroups.recovery.json diff --git a/rootdir/task_profiles.json b/libprocessgroup/profiles/task_profiles.json similarity index 100% rename from rootdir/task_profiles.json rename to libprocessgroup/profiles/task_profiles.json diff --git a/rootdir/Android.mk b/rootdir/Android.mk index b5e5a7125..944554a7b 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -63,38 +63,6 @@ $(foreach b,$(ART_BINARIES), \ include $(BUILD_PREBUILT) -####################################### -# cgroups.json -include $(CLEAR_VARS) - -LOCAL_MODULE := cgroups.json -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) - -include $(BUILD_PREBUILT) - -####################################### -# cgroups.json for recovery -include $(CLEAR_VARS) -LOCAL_MODULE := cgroups.recovery.json -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc -LOCAL_MODULE_STEM := cgroups.json -include $(BUILD_PREBUILT) - -####################################### -# task_profiles.json -include $(CLEAR_VARS) - -LOCAL_MODULE := task_profiles.json -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) - -include $(BUILD_PREBUILT) - ####################################### # asan.options ifneq ($(filter address,$(SANITIZE_TARGET)),)