diff options
author | Sundong Ahn <sundongahn@google.com> | 2018-07-18 00:13:51 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-18 00:13:51 -0700 |
commit | b14564f3b3ae7ac429680a8c38fae3bcf9dc0067 (patch) | |
tree | 9e15bf371dd396f9533aee7e910f592d46276c82 | |
parent | f362ac88f47624e18f5b1d1faec8b3f6301be403 (diff) | |
parent | 2236205ce0d5861b327067985b5a25a66f5ff4fc (diff) | |
download | ims-b14564f3b3ae7ac429680a8c38fae3bcf9dc0067.tar.gz |
Build com.android.ims.rcsmanager with static librarytemp_p_merge
am: 2236205ce0
Change-Id: Ia725ec2d7018b9bd4c68775d109076ce4a8cd2bf
-rw-r--r-- | rcs/presencepolling/Android.mk | 5 | ||||
-rw-r--r-- | rcs/presencepolling/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | rcs/rcsmanager/Android.mk | 15 | ||||
-rw-r--r-- | rcs/rcsmanager/AndroidManifest.xml | 37 | ||||
-rw-r--r-- | rcs/rcsmanager/CleanSpec.mk | 2 | ||||
-rw-r--r-- | rcs/rcsmanager/com.android.ims.rcsmanager.xml | 33 | ||||
-rw-r--r-- | rcs/rcsservice/Android.mk | 4 | ||||
-rw-r--r-- | rcs/rcsservice/AndroidManifest.xml | 3 |
8 files changed, 8 insertions, 94 deletions
diff --git a/rcs/presencepolling/Android.mk b/rcs/presencepolling/Android.mk index 96e2027..95025d6 100644 --- a/rcs/presencepolling/Android.mk +++ b/rcs/presencepolling/Android.mk @@ -29,11 +29,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := com.android.ims.rcsmanager \ - ims-common \ +LOCAL_JAVA_LIBRARIES := ims-common \ telephony-common -LOCAL_REQUIRED_MODULES := com.android.ims.rcsmanager +LOCAL_STATIC_JAVA_LIBRARIES := com.android.ims.rcsmanager LOCAL_PACKAGE_NAME := PresencePolling LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/rcs/presencepolling/AndroidManifest.xml b/rcs/presencepolling/AndroidManifest.xml index 67ece49..9ee86ef 100644 --- a/rcs/presencepolling/AndroidManifest.xml +++ b/rcs/presencepolling/AndroidManifest.xml @@ -62,9 +62,6 @@ android:singleUser="true" android:process="com.android.ims.rcsservice"> - <uses-library android:name="com.android.ims.rcsmanager" - android:required="true"/> - <service android:name=".PollingService" android:excludeFromRecents="true" diff --git a/rcs/rcsmanager/Android.mk b/rcs/rcsmanager/Android.mk index 93452c5..839039d 100644 --- a/rcs/rcsmanager/Android.mk +++ b/rcs/rcsmanager/Android.mk @@ -38,17 +38,4 @@ LOCAL_JAVA_LIBRARIES += ims-common #LOCAL_MODULE_TAGS := optional LOCAL_MODULE := com.android.ims.rcsmanager -LOCAL_REQUIRED_MODULES := com.android.ims.rcsmanager.xml -include $(BUILD_JAVA_LIBRARY) - -# We need to put the permissions XML file into /system/etc/permissions/ so the -# JAR can be dynamically loaded. -include $(CLEAR_VARS) -LOCAL_MODULE := com.android.ims.rcsmanager.xml -#LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) - - +include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/rcs/rcsmanager/AndroidManifest.xml b/rcs/rcsmanager/AndroidManifest.xml deleted file mode 100644 index 630c170..0000000 --- a/rcs/rcsmanager/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2015, Motorola Mobility LLC - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - Neither the name of Motorola Mobility nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY LLC BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. ---> - -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.ims.rcsmanager" - android:versionCode="1" - android:versionName="1.0" > - - <uses-sdk android:minSdkVersion="18" /> - -</manifest> diff --git a/rcs/rcsmanager/CleanSpec.mk b/rcs/rcsmanager/CleanSpec.mk index e8ed98b..e7b80fd 100644 --- a/rcs/rcsmanager/CleanSpec.mk +++ b/rcs/rcsmanager/CleanSpec.mk @@ -52,6 +52,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.ims.rcsmanager_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/JAVA_LIBRARIES/com.android.ims.rcsmanager_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/ETC/com.android.ims.rcsmanager.xml_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.ims.rcsmanager.jar) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/permissions/com.android.ims.rcsmanager.xml) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/rcs/rcsmanager/com.android.ims.rcsmanager.xml b/rcs/rcsmanager/com.android.ims.rcsmanager.xml deleted file mode 100644 index 0737f5d..0000000 --- a/rcs/rcsmanager/com.android.ims.rcsmanager.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - * Copyright (c) 2015, Motorola Mobility LLC - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - Neither the name of Motorola Mobility nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MOTOROLA MOBILITY LLC BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. ---> - -<permissions> - <library name="com.android.ims.rcsmanager" - file="/system/framework/com.android.ims.rcsmanager.jar"/> -</permissions> diff --git a/rcs/rcsservice/Android.mk b/rcs/rcsservice/Android.mk index f3dbb86..5b0aa04 100644 --- a/rcs/rcsservice/Android.mk +++ b/rcs/rcsservice/Android.mk @@ -38,7 +38,9 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := \ $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := telephony-common ims-common com.android.ims.rcsmanager +LOCAL_JAVA_LIBRARIES := telephony-common ims-common + +LOCAL_STATIC_JAVA_LIBRARIES := com.android.ims.rcsmanager #LOCAL_MODULE_TAGS := optional LOCAL_CERTIFICATE := platform diff --git a/rcs/rcsservice/AndroidManifest.xml b/rcs/rcsservice/AndroidManifest.xml index 1d8ea4c..9b9de40 100644 --- a/rcs/rcsservice/AndroidManifest.xml +++ b/rcs/rcsservice/AndroidManifest.xml @@ -57,9 +57,6 @@ <application android:name="RcsServiceApp" android:persistent="true" android:process="com.android.ims.rcsservice"> - <uses-library android:name="com.android.ims.rcsmanager" - android:required="true"/> - <service android:name="com.android.service.ims.RcsService" android:exported="true" android:enabled="true" |