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

Commit 562124e8 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Clean up some style in the makefiles." into gingerbread

parents 3a053db2 80a60ba8

Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir) 
# Instead, it depends on the R.stamp file, which lists the corresponding

# R.java file as a prerequisite.

# TODO: find a more appropriate way to do this.

framework-res-source-path := APPS/framework-res_intermediates/src

framework_res_source_path := APPS/framework-res_intermediates/src



# the library

# ============================================================
@@ -189,9 +189,9 @@ LOCAL_SRC_FILES += \ 
LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)



LOCAL_INTERMEDIATE_SOURCES := \

			$(framework-res-source-path)/android/R.java \

			$(framework-res-source-path)/android/Manifest.java \

			$(framework-res-source-path)/com/android/internal/R.java

			$(framework_res_source_path)/android/R.java \

			$(framework_res_source_path)/android/Manifest.java \

			$(framework_res_source_path)/com/android/internal/R.java



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core ext
@@ -357,9 +357,9 @@ framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ 
	$(FRAMEWORKS_BASE_JAVA_SRC_DIRS)



framework_docs_LOCAL_INTERMEDIATE_SOURCES := \

			$(framework-res-source-path)/android/R.java \

			$(framework-res-source-path)/android/Manifest.java \

			$(framework-res-source-path)/com/android/internal/R.java

			$(framework_res_source_path)/android/R.java \

			$(framework_res_source_path)/android/Manifest.java \

			$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_JAVA_LIBRARIES := \

			core \

tools/layoutlib/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -52,13 +52,15 @@ include $(BUILD_SYSTEM)/base_rules.mk 
$(LOCAL_BUILT_MODULE): $(built_core_dep) \

                       $(built_framework_dep) \

                       $(built_layoutlib_create_jar)

	@echo "host layoutlib_create: $@"

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) echo "host layoutlib_create: $@"

	$(hide) mkdir -p $(dir $@)

	$(hide) rm -f $@

	$(hide) ls -l $(built_framework_classes)

	$(hide) java -jar $(built_layoutlib_create_jar) \

	             $@ \

	             $(built_core_classes) \

	             $(built_framework_classes)

	$(hide) ls -l $(built_framework_classes)





#