diff options
| author | Wink Saville <wink@google.com> | 2012-08-04 08:09:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-04 08:09:35 -0700 |
| commit | f7c060b9ded0613109c1cec05c537c4e846fecd4 (patch) | |
| tree | 396ce83b7ad264bbd75b159210ddcc3a1e9f25a6 | |
| parent | 073517d3e1529f2a6007de5c6fbed5412dcfe59e (diff) | |
| parent | 99dec9ebdfb31432e7fdac5c42b7e7e21f29e287 (diff) | |
| download | frameworks_opt_telephony-f7c060b9ded0613109c1cec05c537c4e846fecd4.zip frameworks_opt_telephony-f7c060b9ded0613109c1cec05c537c4e846fecd4.tar.gz frameworks_opt_telephony-f7c060b9ded0613109c1cec05c537c4e846fecd4.tar.bz2 | |
am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '99dec9ebdfb31432e7fdac5c42b7e7e21f29e287':
Telephony: Move AdnRecord.aidl into opt/telephony
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/AdnRecord.aidl | 20 |
3 files changed, 22 insertions, 0 deletions
@@ -16,6 +16,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java LOCAL_SRC_FILES := \ src/java/com/android/internal/telephony/ISms.aidl \ src/java/com/android/internal/telephony/IIccPhoneBook.aidl \ diff --git a/CleanSpec.mk b/CleanSpec.mk index 9a63705..8b3a29d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -39,6 +39,7 @@ # ************************************************ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/src/java/com/android/internal/telephony/AdnRecord.aidl b/src/java/com/android/internal/telephony/AdnRecord.aidl new file mode 100644 index 0000000..b4a1a29 --- /dev/null +++ b/src/java/com/android/internal/telephony/AdnRecord.aidl @@ -0,0 +1,20 @@ +/* +** Copyright 2007, 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. +*/ + +package com.android.internal.telephony; + +parcelable AdnRecord; + |