Revert "Split out emailcommon/Android.mk"
This reverts commit c28bf35319
.
This commit is contained in:
parent
7c87bfc33a
commit
a07f2ae0b1
21
Android.mk
21
Android.mk
|
@ -43,6 +43,27 @@ include $(BUILD_PACKAGE)
|
||||||
|
|
||||||
# only include rules to build other stuff for the original package, not derived package.
|
# only include rules to build other stuff for the original package, not derived package.
|
||||||
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
|
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
|
||||||
|
|
||||||
|
# Build the com.android.emailcommon static library. At the moment, this includes
|
||||||
|
# the emailcommon files themselves plus everything under src/org (apache code). All of our
|
||||||
|
# AIDL files are also compiled into the static library
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
LOCAL_MODULE := com.android.emailcommon
|
||||||
|
LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
|
||||||
|
LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
|
||||||
|
LOCAL_SRC_FILES += \
|
||||||
|
src/com/android/emailcommon/service/IEmailService.aidl \
|
||||||
|
src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
|
||||||
|
src/com/android/emailcommon/service/IPolicyService.aidl \
|
||||||
|
src/com/android/emailcommon/service/IAccountService.aidl
|
||||||
|
|
||||||
|
LOCAL_SDK_VERSION := current
|
||||||
|
|
||||||
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||||
|
|
||||||
# additionally, build unit tests in a separate .apk
|
# additionally, build unit tests in a separate .apk
|
||||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
# Copyright 2011, 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.
|
|
||||||
|
|
||||||
LOCAL_PATH := $(call my-dir)
|
|
||||||
|
|
||||||
# Build the com.android.emailcommon static library. At the moment, this includes
|
|
||||||
# the emailcommon files themselves plus everything under src/org (apache code). All of our
|
|
||||||
# AIDL files are also compiled into the static library
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
|
|
||||||
LOCAL_MODULE := com.android.emailcommon
|
|
||||||
LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
|
|
||||||
LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
|
|
||||||
LOCAL_SRC_FILES += \
|
|
||||||
src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
|
|
||||||
src/com/android/emailcommon/service/IEmailService.aidl \
|
|
||||||
src/com/android/emailcommon/service/IPolicyService.aidl \
|
|
||||||
src/com/android/emailcommon/service/IAccountService.aidl
|
|
||||||
|
|
||||||
LOCAL_SDK_VERSION := current
|
|
||||||
|
|
||||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue