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

Commit 96029a12 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I9fda7fe3,I0a34b2b4,Ie64a283d 

* changes:
  Clear resource_export_package outside conditionals
  Fix adbs after move from build/tools to build/make/tools
  Use proguard.jacoco.flags for EMMA_INSTRUMENT_STATIC
parents 8b759c08 ab61f213

core/java_library.mk

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ ifeq (true,$(EMMA_INSTRUMENT)) 
ifeq (true,$(LOCAL_EMMA_INSTRUMENT))

ifeq (true,$(EMMA_INSTRUMENT_STATIC))

LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent

# Exclude jacoco classes from proguard

LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags

endif # LOCAL_EMMA_INSTRUMENT

endif # EMMA_INSTRUMENT_STATIC

else

core/package_internal.mk

+4 −1
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ ifeq (true,$(EMMA_INSTRUMENT_STATIC)) 
ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),)

# Only add jacocoagent if the package contains some java code

LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent

# Exclude jacoco classes from proguard

LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags

endif # Contains java code

else

ifdef LOCAL_SDK_VERSION
@@ -361,6 +363,8 @@ $(foreach x,$(sharded_java_source_list_files),$(eval $(x): $(data_binding_stamp) 
$(full_classes_compiled_jar): $(data_binding_stamp)

endif  # LOCAL_DATA_BINDING



resource_export_package :=



ifeq ($(need_compile_res),true)



###############################
@@ -427,7 +431,6 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_ 


$(proguard_options_file): $(R_file_stamp)



resource_export_package :=

ifdef LOCAL_EXPORT_PACKAGE_RESOURCES

# Put this module's resources into a PRODUCT-agnositc package that

# other packages can use to build their own PRODUCT-agnostic R.java (etc.)

tools/adbs

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import re 
import string

import sys



sys.path.insert(0, os.path.dirname(__file__) + "/../../development/scripts")

sys.path.insert(0, os.path.dirname(__file__) + "/../../../development/scripts")

import stack_core

import symbol