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

Commit defe724c authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Convert Android.mk file to Android.bp" am: 4b5b191b 

am: 1cdaea76

Change-Id: Ic093e88ba7b644239253952c3326c25309ecbfcd
parents eaa8c47c 1cdaea76

packages/BackupRestoreConfirmation/Android.bp

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

// Copyright (C) 2011 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: "BackupRestoreConfirmation",

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    privileged: true,

}

packages/BackupRestoreConfirmation/Android.mk

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#

# Copyright (C) 2011 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.

#



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := BackupRestoreConfirmation

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



include $(BUILD_PACKAGE)



########################

include $(call all-makefiles-under,$(LOCAL_PATH))

packages/CarrierDefaultApp/Android.bp

0 → 100644
+6 −0
Original line number Diff line number Diff line 
android_app {

    name: "CarrierDefaultApp",

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

}

packages/CarrierDefaultApp/Android.mk

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

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := CarrierDefaultApp

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)



# This finds and builds the test apk as well, so a single make does both.

include $(call all-makefiles-under,$(LOCAL_PATH))

packages/CarrierDefaultApp/tests/Android.mk

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
# Copyright 2016, 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.



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_CERTIFICATE := platform



# Include all makefiles in subdirectories

include $(call all-makefiles-under,$(LOCAL_PATH))