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

Commit 1c53cc16 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

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
parent 9f89b339

data/etc/platform.xml

+0 −2
Original line number Diff line number Diff line
@@ -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. -->

obex/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
//

// 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"],

}

obex/Android.mk

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
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

obex/CleanSpec.mk

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# 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)

obex/api/current.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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;

  }



}