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

Commit 99dec9eb authored by Wink Saville's avatar Wink Saville Committed by android code review
Browse files

Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

parents d016bfd4 cd4ae4aa

Android.mk

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

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

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



$(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)



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

src/java/com/android/internal/telephony/AdnRecord.aidl

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

** 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;