diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-11-09 21:51:01 +0000 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-11-17 13:48:02 +0000 |
| commit | b359438e11520b3e3b6801ad1280e1bdef2b986c (patch) | |
| tree | 66c6170430bb1986c1d4e427bc3734e2712de3b7 /Android.mk | |
| parent | 22e6e8f6e1a5a5e677269d6f7895ff49b1a8f41b (diff) | |
| download | external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.zip external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.tar.gz external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -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. |