Merge "Add more error checking for ndc" into froyo (89bc1395) · Commits · e / os / android_frameworks_base

Android.mk

+12 −2

Original line number	Diff line number	Diff line
		@@ -198,6 +198,9 @@ LOCAL_JAVA_LIBRARIES := core ext
		LOCAL_MODULE := framework
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		LOCAL_NO_EMMA_INSTRUMENT := true
		LOCAL_NO_EMMA_COMPILE := true

		# List of classes and interfaces which should be loaded by the Zygote.
		LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes

		@@ -294,7 +297,7 @@ fwbase_dirs_to_document := \
		# as "final" in the official SDK APIs.
		fwbase_dirs_to_document += core/config/sdk

		# These are relative to dalvik/libcore
		# These are relative to libcore
		# Intentionally not included from libcore:
		# icu openssl suncompat support
		libcore_to_document := \
		@@ -334,7 +337,7 @@ non_base_dirs := \
		dirs_to_document := \
		$(fwbase_dirs_to_document) \
		$(non_base_dirs) \
		$(addprefix ../../dalvik/libcore/, $(libcore_to_document))
		$(addprefix ../../libcore/, $(libcore_to_document))

		html_dirs := \
		$(FRAMEWORKS_BASE_SUBDIRS) \
		@@ -345,6 +348,10 @@ framework_docs_LOCAL_SRC_FILES := \
		$(call find-other-java-files, $(dirs_to_document)) \
		$(call find-other-html-files, $(html_dirs))

		# This is used by ide.mk as the list of source files that are
		# always included.
		INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document))

		framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \
		$(FRAMEWORKS_BASE_JAVA_SRC_DIRS)

		@@ -592,6 +599,9 @@ LOCAL_JAVA_LIBRARIES := core

		LOCAL_MODULE := ext

		LOCAL_NO_EMMA_INSTRUMENT := true
		LOCAL_NO_EMMA_COMPILE := true

		include $(BUILD_JAVA_LIBRARY)

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.policy*)
		$(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/android.policy.jar)


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

0 → 100644

+395736 −0

File added.

Preview size limit exceeded, changes collapsed.

+4705 −0

File changed.

Preview size limit exceeded, changes collapsed.

+18 −15

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)

		#
		# Set USE_CAMERA_STUB for non-emulator and non-simulator builds, if you want
		# the camera service to use the fake camera. For emulator or simulator builds,
		# we always use the fake camera.
		# Set USE_CAMERA_STUB if you don't want to use the hardware camera.

		ifeq ($(USE_CAMERA_STUB),)
		USE_CAMERA_STUB:=false
		# force these builds to use camera stub only
		ifneq ($(filter sooner generic sim,$(TARGET_DEVICE)),)
		USE_CAMERA_STUB:=true
		endif #libcamerastub
		endif

		ifeq ($(USE_CAMERA_STUB),true)
		INCLUDE_CAMERA_STUB:=true
		INCLUDE_CAMERA_HARDWARE:=false
		else
		INCLUDE_CAMERA_STUB:=true # set this to true temporarily for testing
		INCLUDE_CAMERA_HARDWARE:=true
		endif

		ifeq ($(INCLUDE_CAMERA_STUB),true)
		#
		# libcamerastub
		#
		@@ -32,7 +35,7 @@ endif
		LOCAL_SHARED_LIBRARIES:= libui

		include $(BUILD_STATIC_LIBRARY)
		endif # USE_CAMERA_STUB
		endif # INCLUDE_CAMERA_STUB

		#
		# libcameraservice
		@@ -54,18 +57,18 @@ LOCAL_SHARED_LIBRARIES:= \

		LOCAL_MODULE:= libcameraservice

		LOCAL_CFLAGS += -DLOG_TAG=\"CameraService\"

		ifeq ($(TARGET_SIMULATOR),true)
		LOCAL_CFLAGS += -DSINGLE_PROCESS
		endif

		ifeq ($(USE_CAMERA_STUB), true)
		ifeq ($(INCLUDE_CAMERA_STUB), true)
		LOCAL_STATIC_LIBRARIES += libcamerastub
		LOCAL_CFLAGS += -include CameraHardwareStub.h
		else
		LOCAL_CFLAGS += -DINCLUDE_CAMERA_STUB
		endif

		ifeq ($(INCLUDE_CAMERA_HARDWARE),true)
		LOCAL_CFLAGS += -DINCLUDE_CAMERA_HARDWARE
		LOCAL_SHARED_LIBRARIES += libcamera
		endif

		include $(BUILD_SHARED_LIBRARY)