Merge "Build java.obex with java_sdk_library"

am: ad769993a9

Change-Id: I3a895f10880efb9ae916376f62d059941a25e417
This commit is contained in:
Sundong Ahn
2018-05-29 18:38:07 -07:00
committed by android-build-merger
10 changed files with 51 additions and 22 deletions

View File

@@ -167,8 +167,6 @@
file="/system/framework/android.test.mock.jar" />
<library name="android.test.runner"
file="/system/framework/android.test.runner.jar" />
<library name="javax.obex"
file="/system/framework/javax.obex.jar" />
<!-- These are the standard packages that are white-listed to always have internet
access while in power save mode, even if they aren't in the foreground. -->

21
obex/Android.bp Normal file
View File

@@ -0,0 +1,21 @@
//
// Copyright (C) 2018 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.
//
java_sdk_library {
name: "javax.obex",
srcs: ["javax/**/*.java"],
api_packages: ["javax.obex"],
}

View File

@@ -1,20 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE:= javax.obex
include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE:= javax.obexstatic
include $(BUILD_STATIC_JAVA_LIBRARY)

18
obex/CleanSpec.mk Normal file
View File

@@ -0,0 +1,18 @@
#
# Copyright (C) 2018 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.
#
# runtime lib is renamed from javax.obex.jar to javax.obex.impl.jar
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/javax.obex.jar)

12
obex/api/current.txt Normal file
View File

@@ -0,0 +1,12 @@
package javax.obex {
public class ObexPacket {
method public static javax.obex.ObexPacket read(java.io.InputStream) throws java.io.IOException;
method public static javax.obex.ObexPacket read(int, java.io.InputStream) throws java.io.IOException;
field public int mHeaderId;
field public int mLength;
field public byte[] mPayload;
}
}

0
obex/api/removed.txt Normal file
View File

View File

View File

View File

View File