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

Commit 168fb739 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert frameworks-base-overlays to Android.bp" into main am:... 

Merge "Convert frameworks-base-overlays to Android.bp" into main am: fbba8e2c am: 96d93215 am: 76c1dc9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2894661



Change-Id: I770c3df52e873b02231cc06457b2d51f3b3d8465
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b15365f 76c1dc9d

packages/overlays/Android.bp

0 → 100644
+44 −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.



package {

    // See: http://go/android-license-faq

    default_applicable_licenses: [

        "frameworks_base_license",

    ],

}



phony {

    name: "frameworks-base-overlays",

    required: [

        "DisplayCutoutEmulationCornerOverlay",

        "DisplayCutoutEmulationDoubleOverlay",

        "DisplayCutoutEmulationHoleOverlay",

        "DisplayCutoutEmulationTallOverlay",

        "DisplayCutoutEmulationWaterfallOverlay",

        "FontNotoSerifSourceOverlay",

        "NavigationBarMode3ButtonOverlay",

        "NavigationBarModeGesturalOverlay",

        "NavigationBarModeGesturalOverlayNarrowBack",

        "NavigationBarModeGesturalOverlayWideBack",

        "NavigationBarModeGesturalOverlayExtraWideBack",

        "TransparentNavigationBarOverlay",

        "NotesRoleEnabledOverlay",

        "preinstalled-packages-platform-overlays.xml",

    ],

}



phony {

    name: "frameworks-base-overlays-debug",

}

packages/overlays/Android.mk

deleted100644 → 0
+0 −47
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.



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE := frameworks-base-overlays

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE

LOCAL_REQUIRED_MODULES := \

	DisplayCutoutEmulationCornerOverlay \

	DisplayCutoutEmulationDoubleOverlay \

    DisplayCutoutEmulationHoleOverlay \

	DisplayCutoutEmulationTallOverlay \

	DisplayCutoutEmulationWaterfallOverlay \

	FontNotoSerifSourceOverlay \

	NavigationBarMode3ButtonOverlay \

	NavigationBarModeGesturalOverlay \

	NavigationBarModeGesturalOverlayNarrowBack \

	NavigationBarModeGesturalOverlayWideBack \

	NavigationBarModeGesturalOverlayExtraWideBack \

	TransparentNavigationBarOverlay \

	NotesRoleEnabledOverlay \

	preinstalled-packages-platform-overlays.xml



include $(BUILD_PHONY_PACKAGE)

include $(CLEAR_VARS)



LOCAL_MODULE := frameworks-base-overlays-debug

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE



include $(BUILD_PHONY_PACKAGE)

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