diff options
author | Brad Ebinger <breadley@google.com> | 2021-03-03 23:51:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 23:51:43 +0000 |
commit | cf32fb1e94bbd298bc9ee18afffbe8ce22168742 (patch) | |
tree | 596c973cbd8cf07123fdb502091998cc66ae58ae | |
parent | 8b7fdda762c33bd766eccc9d91c0fe8035dd40dd (diff) | |
parent | fb09d4553ff8681598e09695266d7dd82da727ce (diff) | |
download | ims-cf32fb1e94bbd298bc9ee18afffbe8ce22168742.tar.gz |
Move RCS apps to system-ext am: fb09d4553f
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1613879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a63af8dce72980f1aa1dba1a4fcac788311e3e5
-rw-r--r-- | rcs/presencepolling/Android.bp | 3 | ||||
-rw-r--r-- | rcs/presencepolling/CleanSpec.mk | 44 | ||||
-rw-r--r-- | rcs/rcsservice/Android.bp | 3 | ||||
-rw-r--r-- | rcs/rcsservice/CleanSpec.mk | 45 |
4 files changed, 93 insertions, 2 deletions
diff --git a/rcs/presencepolling/Android.bp b/rcs/presencepolling/Android.bp index 124c1c7..ed4a656 100644 --- a/rcs/presencepolling/Android.bp +++ b/rcs/presencepolling/Android.bp @@ -58,8 +58,9 @@ java_defaults { name: "presence_polling_defaults", srcs: ["src/**/*.java"], static_libs: ["com.android.ims.rcsmanager"], - platform_apis: true, certificate: "platform", + system_ext_specific: true, + platform_apis: true, optimize: { proguard_flags_files: ["proguard.flags"], }, diff --git a/rcs/presencepolling/CleanSpec.mk b/rcs/presencepolling/CleanSpec.mk new file mode 100644 index 0000000..f9d044f --- /dev/null +++ b/rcs/presencepolling/CleanSpec.mk @@ -0,0 +1,44 @@ +# Copyright (C) 2021 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 +# ***************************************************************** +# Remove old version of PresencePolling in system, since this moved to system-ext +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/PresencePolling) +# ****************************************************************** +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER +# ****************************************************************** diff --git a/rcs/rcsservice/Android.bp b/rcs/rcsservice/Android.bp index e1d94ab..ad24544 100644 --- a/rcs/rcsservice/Android.bp +++ b/rcs/rcsservice/Android.bp @@ -61,7 +61,6 @@ java_library { android_app { // This is the target being built. (Name of APK) name: "RcsService", - platform_apis: true, // Only compile source java files in this apk. srcs: [ "src/com/android/service/ims/AlarmBroadcastReceiver.java", @@ -79,4 +78,6 @@ android_app { "com.android.ims.rcsmanager" ], certificate: "platform", + system_ext_specific: true, + platform_apis: true, } diff --git a/rcs/rcsservice/CleanSpec.mk b/rcs/rcsservice/CleanSpec.mk new file mode 100644 index 0000000..5fb4204 --- /dev/null +++ b/rcs/rcsservice/CleanSpec.mk @@ -0,0 +1,45 @@ +# Copyright (C) 2021 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 +# ***************************************************************** +# Remove old version of RcsService in system, since this moved to system-ext +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/RcsService) + +# ****************************************************************** +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER +# ****************************************************************** |