diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-23 15:12:42 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-09 20:39:00 -0700 |
| commit | 3deabd220cf7b1ca0824987e90b8ecc07087f05a (patch) | |
| tree | a737476c6d4125cdef0e99dba94bb992b076acb9 /Android.mk | |
| parent | d6e67fd7082cf8c6ef5544dc740f9052add21538 (diff) | |
| download | libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.zip libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.gz libcore-3deabd220cf7b1ca0824987e90b8ecc07087f05a.tar.bz2 | |
Remove deprecated WITH_HOST_DALVIK.
Bug: 13751317
Fix the Mac host build:
- conditionally define constants using pre-existing pattern,
- make Posix calls that the Mac doesn't support throw
UnsupportedOperationException.
Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 34 |
1 files changed, 16 insertions, 18 deletions
@@ -55,23 +55,21 @@ endif # "m dalvik-host" for quick minimal host build # -ifeq ($(WITH_HOST_DALVIK),true) - .PHONY: dalvik-host - dalvik-host: \ - dalvik \ - $(HOST_OUT)/bin/dalvikvm \ - $(HOST_OUT)/bin/dexopt \ - $(HOST_OUT)/lib/libjavacore.so \ - $(HOST_OUT)/lib/libjavacrypto.so \ - $(HOST_OUT)/lib/libjavacoretests.so \ - cacerts-host \ - core-hostdex \ - conscrypt-hostdex \ - okhttp-hostdex \ - bouncycastle-hostdex \ - apache-xml-hostdex \ - apache-harmony-tests-hostdex \ - $(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar -endif +.PHONY: dalvik-host +dalvik-host: \ + dalvik \ + $(HOST_OUT)/bin/dalvikvm \ + $(HOST_OUT)/bin/dexopt \ + $(HOST_OUT)/lib/libjavacore.so \ + $(HOST_OUT)/lib/libjavacrypto.so \ + $(HOST_OUT)/lib/libjavacoretests.so \ + cacerts-host \ + core-hostdex \ + conscrypt-hostdex \ + okhttp-hostdex \ + bouncycastle-hostdex \ + apache-xml-hostdex \ + apache-harmony-tests-hostdex \ + $(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar include $(subdir_makefiles) |