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

Commit 463265c0 authored by markchien's avatar markchien Committed by android-build-merger
Browse files

[Tether07] Clean up build rule for libtetheroffloadjni am: d8676d99 

am: 510a3540

Change-Id: I19c8f6769caced592fbbffcbd829ae2dc12365d9
parents 2629f2a5 510a3540

packages/Tethering/Android.bp

+17 −4
Original line number Diff line number Diff line
@@ -41,20 +41,26 @@ android_library { 
    defaults: ["TetheringAndroidLibraryDefaults"],

}



cc_library_shared {

// Due to b/143733063, APK can't access a jni lib that is in APEX (but not in the APK).

cc_library {

    name: "libtetheroffloadjni",

    srcs: [

        "jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",

    ],

    shared_libs: [

        "libnativehelper",

        "libcutils",

        "android.hardware.tetheroffload.config@1.0",

        "libcgrouprc",

        "libnativehelper_compat_libc++",

        "libvndksupport",

    ],

    static_libs: [

        "android.hardware.tetheroffload.config@1.0",

        "liblog",

        "libbase",

        "libbinderthreadstate",

        "libcutils",

        "libhidlbase",

        "libjsoncpp",

        "libprocessgroup",

        "libutils",

    ],
@@ -64,6 +70,8 @@ cc_library_shared { 
        "-Wno-unused-parameter",

        "-Wthread-safety",

    ],



    ldflags: ["-Wl,--exclude-libs=ALL,-error-limit=0"],

}



// Common defaults for compiling the actual APK.
@@ -71,7 +79,12 @@ java_defaults { 
    name: "TetheringAppDefaults",

    platform_apis: true,

    privileged: true,

    // Build system doesn't track transitive dependeicies for jni_libs, list all the dependencies

    // explicitly.

    jni_libs: [

        "libcgrouprc",

        "libnativehelper_compat_libc++",

        "libvndksupport",

        "libtetheroffloadjni",

    ],

    resource_dirs: [

packages/Tethering/CleanSpec.mk

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# Copyright (C) 2019 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.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

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

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

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



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Tethering)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)



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

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

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

services/core/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ java_library_static { 
        "android.hardware.biometrics.face-V1.0-java",

        "android.hardware.biometrics.fingerprint-V2.1-java",

        "android.hardware.oemlock-V1.0-java",

        "android.hardware.tetheroffload.control-V1.0-java",

        "android.hardware.configstore-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hidl.manager-V1.2-java",