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

Commit 1ad4aed0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Build com.android.media.remotedisplay with java_sdk_library"

parents 58d5c1e9 881a9872

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/statsd 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediadrm.signer.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

media/lib/remotedisplay/Android.bp

+4 −18
Original line number Diff line number Diff line
@@ -14,22 +14,8 @@ 
// limitations under the License.

//



droiddoc {

    name: "com.android.media.remotedisplay.stubs-gen-docs",

    srcs: [

        "java/**/*.java",

    ],

    args: " -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +

          " -stubpackages com.android.media.remotedisplay " +

          " -nodocs ",

    custom_template: "droiddoc-templates-sdk",

    installable: false,

}



java_library_static {

    name: "com.android.media.remotedisplay.stubs",

    srcs: [

        ":com.android.media.remotedisplay.stubs-gen-docs",

    ],

    sdk_version: "current",

java_sdk_library {

    name: "com.android.media.remotedisplay",

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

    api_packages: ["com.android.media.remotedisplay"],

}

media/lib/remotedisplay/Android.mk

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

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



# the remotedisplay library

# ============================================================

include $(CLEAR_VARS)



LOCAL_MODULE:= com.android.media.remotedisplay

LOCAL_MODULE_TAGS := optional



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



include $(BUILD_JAVA_LIBRARY)





# ====  com.android.media.remotedisplay.xml lib def  ========================

include $(CLEAR_VARS)



LOCAL_MODULE := com.android.media.remotedisplay.xml

LOCAL_MODULE_TAGS := optional



LOCAL_MODULE_CLASS := ETC



# This will install the file in /system/etc/permissions

#

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions



LOCAL_SRC_FILES := $(LOCAL_MODULE)



include $(BUILD_PREBUILT)

media/lib/remotedisplay/api/current.txt

0 → 100644
+0 −0

Empty file added.

media/lib/remotedisplay/api/removed.txt

0 → 100644
+0 −0

Empty file added.