Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c0b58f4 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Move permission controller build to soong 

Test: m -j PermissionController
      m -j GooglePermissionController
      Built, flashed, and booted
Bug: 130246849

Change-Id: I28f716fe6c57600dba391e4b9dbee18103bbf0fc
parent 50c93071

Android.bp

0 → 100644
+66 −0
Original line number Diff line number Diff line 
//

// 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.

//





android_app {

    name: "PermissionController",

    sdk_version: "system_current",

    min_sdk_version: "28",

    privileged: true,

    certificate: "platform",



    srcs: [

        "src/**/*.java",

        "src/**/*.proto",

    ],



    static_libs: [

        "iconloader",

        "androidx.car_car",

        "com.google.android.material_material",

        "androidx.transition_transition",

        "androidx.core_core",

        "androidx.media_media",

        "androidx.legacy_legacy-support-core-utils",

        "androidx.legacy_legacy-support-core-ui",

        "androidx.fragment_fragment",

        "androidx.appcompat_appcompat",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "androidx.leanback_leanback",

        "androidx.leanback_leanback-preference",

        "androidx.lifecycle_lifecycle-extensions",

        "androidx.lifecycle_lifecycle-common-java8",

        "SettingsLibHelpUtils",

        "SettingsLibRestrictedLockUtils",

        "SettingsLibAppPreference",

        "SettingsLibSearchWidget",

        "SettingsLibLayoutPreference",

        "SettingsLibBarChartPreference",

        "SettingsLibActionBarShadow",

        "SettingsLibProgressBar",

        "androidx.annotation_annotation",

    ],



    proto: {

        type: "lite",

    },



    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

}

Android.mk

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



# In order to build the apk and tests for both AOSP and other builds

# via inherit-package, the makefile for PermissionController itself must

# not include the subdir makefiles, so it is split into its own makefile.

include $(LOCAL_PATH)/PermissionController.mk $(call all-makefiles-under,$(LOCAL_PATH))

PermissionController.mk

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-proto-files-under, src)



LOCAL_STATIC_ANDROID_LIBRARIES += \

    iconloader \

    androidx.car_car \

    com.google.android.material_material \

    androidx.transition_transition \

    androidx.core_core \

    androidx.media_media \

    androidx.legacy_legacy-support-core-utils \

    androidx.legacy_legacy-support-core-ui \

    androidx.fragment_fragment \

    androidx.appcompat_appcompat \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    androidx.legacy_legacy-preference-v14 \

    androidx.leanback_leanback \

    androidx.leanback_leanback-preference \

    androidx.lifecycle_lifecycle-extensions \

    androidx.lifecycle_lifecycle-common-java8 \

    SettingsLibHelpUtils \

    SettingsLibRestrictedLockUtils \

    SettingsLibAppPreference \

    SettingsLibSearchWidget \

    SettingsLibLayoutPreference \

    SettingsLibBarChartPreference \

    SettingsLibActionBarShadow \

    SettingsLibProgressBar



LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx.annotation_annotation



LOCAL_PACKAGE_NAME := PermissionController

LOCAL_SDK_VERSION := system_current

LOCAL_MIN_SDK_VERSION := 28

LOCAL_PRIVILEGED_MODULE := true

LOCAL_CERTIFICATE := platform

LOCAL_PROTOC_OPTIMIZE_TYPE := lite



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include $(BUILD_PACKAGE)