0719940ce4
Moved ipconnectivity.proto from services.core.jar to framework-protos.jar. Replaced 'mergeFrom' MessageNano base class calls, with 'parseFrom' IpConnectivityLog calls. This solves an issue where the services.jar would conflict with duplicate nano proto base class definitions in other .jars (wifi-service.jar). Bug: 32261442 Test: Existing unit tests pass Change-Id: I49100935fcae2e85e12eaa7f3462864f3a340b97
39 lines
1.3 KiB
Makefile
39 lines
1.3 KiB
Makefile
LOCAL_PATH := $(call my-dir)
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := services.core
|
|
|
|
LOCAL_AIDL_INCLUDES := system/netd/server/binder
|
|
|
|
LOCAL_SRC_FILES += \
|
|
$(call all-java-files-under,java) \
|
|
java/com/android/server/EventLogTags.logtags \
|
|
java/com/android/server/am/EventLogTags.logtags \
|
|
../../../../system/netd/server/binder/android/net/INetd.aidl \
|
|
../../../../system/netd/server/binder/android/net/metrics/INetdEventListener.aidl \
|
|
|
|
LOCAL_AIDL_INCLUDES += \
|
|
system/netd/server/binder
|
|
|
|
LOCAL_JAVA_LIBRARIES := \
|
|
services.net \
|
|
telephony-common \
|
|
android.hardware.power@1.0-java \
|
|
android.hardware.light@2.0-java
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update
|
|
|
|
ifneq ($(INCREMENTAL_BUILDS),)
|
|
LOCAL_PROGUARD_ENABLED := disabled
|
|
LOCAL_JACK_ENABLED := incremental
|
|
endif
|
|
|
|
LOCAL_JACK_FLAGS := \
|
|
-D jack.transformations.boost-locked-region-priority=true \
|
|
-D jack.transformations.boost-locked-region-priority.classname=com.android.server.am.ActivityManagerService \
|
|
-D jack.transformations.boost-locked-region-priority.request=com.android.server.am.ActivityManagerService\#boostPriorityForLockedSection \
|
|
-D jack.transformations.boost-locked-region-priority.reset=com.android.server.am.ActivityManagerService\#resetPriorityAfterLockedSection
|
|
|
|
include $(BUILD_STATIC_JAVA_LIBRARY)
|