diff options
| author | 2012-02-21 09:05:47 -0800 | |
|---|---|---|
| committer | 2012-02-21 09:05:47 -0800 | |
| commit | 582e95bc373f3aad97e871bf95f8566cf8eb6823 (patch) | |
| tree | 6ca01dde6361cf698bc8205f7eb32a3d79040c44 | |
| parent | 4c69fc575e3bc76536c167969a098e776ba53143 (diff) | |
| parent | c6389e5d93ce97c0399117a7cc8afc062ed6258b (diff) | |
Merge "Update stagefright makefile after dropping support for JSC"
| -rw-r--r-- | media/libstagefright/Android.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 483e5ab0c160..3f9ba47e1345 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -93,13 +93,7 @@ LOCAL_STATIC_LIBRARIES := \ # The following was shamelessly copied from external/webkit/Android.mk and # currently must follow the same logic to determine how webkit was built and -# if it's safe to link against libchromium.net - -# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot -# use the Chrome http stack either. -ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) - USE_ALT_HTTP := true -endif +# if it's safe to link against libchromium_net # See if the user has specified a stack they want to use HTTP_STACK = $(HTTP) |