diff options
| author | dhacker29 <davidhackerdvm@gmail.com> | 2013-08-11 18:34:10 -0500 |
|---|---|---|
| committer | dhacker29 <davidhackerdvm@gmail.com> | 2013-08-11 18:34:10 -0500 |
| commit | 1edce84049cdad7f56d852239e2230b65f47365c (patch) | |
| tree | 1f041c3ed865554b2d81574e8b0ba77ae257e0d7 /vm/mterp | |
| parent | 2504595990329d34f90be397868c7e6855d0e3cf (diff) | |
| download | android_dalvik-1edce84049cdad7f56d852239e2230b65f47365c.tar.gz android_dalvik-1edce84049cdad7f56d852239e2230b65f47365c.tar.bz2 android_dalvik-1edce84049cdad7f56d852239e2230b65f47365c.zip | |
Fix merge error
Change-Id: I9a9ffebaac3364da3408b4c4703d47c159dc24ae
Diffstat (limited to 'vm/mterp')
| -rwxr-xr-x | vm/mterp/rebuild.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vm/mterp/rebuild.sh b/vm/mterp/rebuild.sh index 5a0b5cd75..ecdd55723 100755 --- a/vm/mterp/rebuild.sh +++ b/vm/mterp/rebuild.sh @@ -20,7 +20,6 @@ # set -e -<<<<<<< HEAD for arch in portable allstubs armv5te armv5te-vfp armv6j armv6-vfp armv7-a armv7-a-neon mips x86; do TARGET_ARCH_EXT=$arch make -f Makefile-mterp; done # These aren't actually used, so just go ahead and remove them. The correct |