Promote opcode-gen to the dalvik directory.
This tool will soon be used to generate code in libdex, so it
doesn't make sense for it to live in the dx directory.
Change-Id: I63ff7ccceac08fbe314fb0782dc8f2b5d75d155a
diff --git a/dx/etc/bytecode.txt b/opcode-gen/bytecode.txt
similarity index 100%
rename from dx/etc/bytecode.txt
rename to opcode-gen/bytecode.txt
diff --git a/dx/etc/opcode-gen b/opcode-gen/opcode-gen
similarity index 99%
rename from dx/etc/opcode-gen
rename to opcode-gen/opcode-gen
index b10a399..f570268 100755
--- a/dx/etc/opcode-gen
+++ b/opcode-gen/opcode-gen
@@ -29,6 +29,8 @@
file="$1"
tmpfile="/tmp/$$.txt"
+echo "processing `basename $1`"
+
if [ "x$1" = "x" ]; then
echo "must specify a file"
exit 1
diff --git a/dx/etc/run-opcode-gen b/opcode-gen/regen-all
similarity index 80%
rename from dx/etc/run-opcode-gen
rename to opcode-gen/regen-all
index c4d1ae4..790bf84 100755
--- a/dx/etc/run-opcode-gen
+++ b/opcode-gen/regen-all
@@ -34,11 +34,9 @@
# Be in the parent of the progdir when running the rest of the script.
cd ".."
-echo "processing DalvOps.java"
-${progdir}/opcode-gen src/com/android/dx/dex/code/DalvOps.java
+${progdir}/opcode-gen dx/src/com/android/dx/dex/code/DalvOps.java
+${progdir}/opcode-gen dx/src/com/android/dx/dex/code/Dops.java
+${progdir}/opcode-gen dx/src/com/android/dx/dex/code/RopToDop.java
-echo "processing Dops.java"
-${progdir}/opcode-gen src/com/android/dx/dex/code/Dops.java
-
-echo "processing RopToDop.java"
-${progdir}/opcode-gen src/com/android/dx/dex/code/RopToDop.java
+# Coming soon!
+# ${progdir}/opcode-gen libdex/OpCode.h