From b359438e11520b3e3b6801ad1280e1bdef2b986c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 9 Nov 2011 21:51:01 +0000 Subject: Removing ANDROID_INSTRUMENTATION code This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c --- Android.mk | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 623a35f..f5ff741 100644 --- a/Android.mk +++ b/Android.mk @@ -352,10 +352,6 @@ ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),true) LOCAL_CFLAGS += -DWTF_USE_ACCELERATED_COMPOSITING=1 endif -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_CFLAGS += -DANDROID_INSTRUMENT -endif - # LOCAL_LDLIBS is used in simulator builds only and simulator builds are only # valid on Linux LOCAL_LDLIBS += -lpthread -ldl @@ -381,10 +377,6 @@ ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5) LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client endif -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_SHARED_LIBRARIES += libhardware_legacy -endif - # We have to use the android version of libdl LOCAL_SHARED_LIBRARIES += libdl libstlport # We have to fake out some headers when using stlport. -- cgit v1.1