diff options
author | Sundong Ahn <sundongahn@google.com> | 2018-05-18 09:58:11 +0900 |
---|---|---|
committer | Sundong Ahn <sundongahn@google.com> | 2018-05-30 00:19:01 +0000 |
commit | 1c53cc161d5a8262fd959c8cd867b138b6344bba (patch) | |
tree | 03f213d98b1a4a61b560915914c01a3a5d87a7d7 /obex | |
parent | 9f89b3393d44871d62d00a143f507305f40a1b6e (diff) | |
download | base-1c53cc161d5a8262fd959c8cd867b138b6344bba.tar.gz |
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Diffstat (limited to 'obex')
-rw-r--r-- | obex/Android.bp | 21 | ||||
-rw-r--r-- | obex/Android.mk | 20 | ||||
-rw-r--r-- | obex/CleanSpec.mk | 18 | ||||
-rw-r--r-- | obex/api/current.txt | 12 | ||||
-rw-r--r-- | obex/api/removed.txt | 0 | ||||
-rw-r--r-- | obex/api/system-current.txt | 0 | ||||
-rw-r--r-- | obex/api/system-removed.txt | 0 | ||||
-rw-r--r-- | obex/api/test-current.txt | 0 | ||||
-rw-r--r-- | obex/api/test-removed.txt | 0 |
9 files changed, 51 insertions, 20 deletions
diff --git a/obex/Android.bp b/obex/Android.bp new file mode 100644 index 000000000000..6558eb36d001 --- /dev/null +++ b/obex/Android.bp @@ -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"], +} diff --git a/obex/Android.mk b/obex/Android.mk deleted file mode 100644 index e7c1fd34dd74..000000000000 --- a/obex/Android.mk +++ /dev/null @@ -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)
\ No newline at end of file diff --git a/obex/CleanSpec.mk b/obex/CleanSpec.mk new file mode 100644 index 000000000000..c104234e4fd9 --- /dev/null +++ b/obex/CleanSpec.mk @@ -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) diff --git a/obex/api/current.txt b/obex/api/current.txt new file mode 100644 index 000000000000..1cd562feff8d --- /dev/null +++ b/obex/api/current.txt @@ -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; + } + +} + diff --git a/obex/api/removed.txt b/obex/api/removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/obex/api/removed.txt diff --git a/obex/api/system-current.txt b/obex/api/system-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/obex/api/system-current.txt diff --git a/obex/api/system-removed.txt b/obex/api/system-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/obex/api/system-removed.txt diff --git a/obex/api/test-current.txt b/obex/api/test-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/obex/api/test-current.txt diff --git a/obex/api/test-removed.txt b/obex/api/test-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/obex/api/test-removed.txt |