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

Commit aa98bac2 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert more of frameworks/base/packages to Android.bp" into...

Merge "Convert more of frameworks/base/packages to Android.bp" into stage-aosp-master am: ba9073a6 am: 97c07ce0
am: 7d089ac5

Change-Id: I31ec5ab872c44bd6652abe42328aecb9c3e65eb5
parents 02fe6b20 7d089ac5
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
android_app {
    name: "DynamicSystemInstallationService",

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

    certificate: "platform",
    privileged: true,
    platform_apis: true,

    optimize: {
        enabled: false,
    },
}
+0 −19
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_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)

LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := DynamicSystemInstallationService
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_PROGUARD_ENABLED := disabled


include $(BUILD_PACKAGE)
+42 −0
Original line number Diff line number Diff line
// Copyright (C) 2012 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: "InputDevices",

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

    resource_dirs: ["res"],

    sdk_version: "current",
    certificate: "platform",
    privileged: true,
}

// Validate all key maps.
// Produces an empty srcjar that is used as an input to InputDevices to make sure
// the check runs for platform builds.
genrule {
    name: "validate_input_devices_keymaps",
    tools: [
        "validatekeymaps",
        "soong_zip",
    ],
    srcs: ["res/raw/*.kcm"],
    out: ["validate_input_devices_keymaps.srcjar"],
    cmd: "$(location validatekeymaps) -q $(in) && $(location soong_zip) -o $(out)",
}

packages/InputDevices/Android.mk

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line
# Copyright (C) 2012 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-subdir-java-files)

LOCAL_JAVA_LIBRARIES :=

LOCAL_PACKAGE_NAME := InputDevices
LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true

include $(BUILD_PACKAGE)

# Validate all key maps.
include $(CLEAR_VARS)

LOCAL_MODULE := validate_input_devices_keymaps
intermediates := $(call intermediates-dir-for,ETC,$(LOCAL_MODULE),,COMMON)
LOCAL_BUILT_MODULE := $(intermediates)/stamp

validatekeymaps := $(HOST_OUT_EXECUTABLES)/validatekeymaps$(HOST_EXECUTABLE_SUFFIX)
input_devices_keymaps := $(wildcard $(LOCAL_PATH)/res/raw/*.kcm)
$(LOCAL_BUILT_MODULE): PRIVATE_VALIDATEKEYMAPS := $(validatekeymaps)
$(LOCAL_BUILT_MODULE) : $(input_devices_keymaps) | $(validatekeymaps)
	$(hide) $(PRIVATE_VALIDATEKEYMAPS) -q $^
	$(hide) mkdir -p $(dir $@) && touch $@

# Run validatekeymaps unconditionally for platform build.
droidcore : $(LOCAL_BUILT_MODULE)

# Reset temp vars.
validatekeymaps :=
input_devices_keymaps :=
+11 −0
Original line number Diff line number Diff line
android_app {
    name: "MtpDocumentsProvider",

    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "media",
    privileged: true,
    optimize: {
        proguard_flags_files: ["proguard.flags"],
    },
}
Loading