Replace more occurrences of `make` with `m` in ART.
Calling `make` is no longer supported since
https://android-review.googlesource.com/c/platform/build/+/1092954/.
Test: n/a
Change-Id: Ie2a0bcf7ea45b5ce82b471de31abb848a102c0ad
diff --git a/test/README.chroot.md b/test/README.chroot.md
index f5ca6d8..447b17a 100644
--- a/test/README.chroot.md
+++ b/test/README.chroot.md
@@ -58,7 +58,7 @@
```bash
. ./build/envsetup.sh
lunch aosp_arm64-eng # or aosp_arm-eng for 32-bit ARM
- make adb
+ m adb
```
3. Build ART and required dependencies:
```bash
@@ -84,7 +84,7 @@
* Note: This currently fails on test
`test-art-target-gtest-image_space_test{32,64}` when using the full AOSP
tree (b/119815008).
- * Workaround: Run `make clean-oat-host` before the build step
+ * Workaround: Run `m clean-oat-host` before the build step
(`art/tools/buildbot-build.sh --target -j40`) above.
* Note: The `-j` option is not honored yet (b/129930445).
8. Run ART run-tests:
diff --git a/tools/generate_cmake_lists.py b/tools/generate_cmake_lists.py
index 6c3ce08..5639617 100755
--- a/tools/generate_cmake_lists.py
+++ b/tools/generate_cmake_lists.py
@@ -68,7 +68,7 @@
ANDROID_BUILD_TOP = get_android_build_top()
- subprocess.check_output(('make -j64 -C %s') % (ANDROID_BUILD_TOP), shell=True)
+ subprocess.check_output('m -j64', shell=True, cwd=ANDROID_BUILD_TOP)
out_art_cmakelists_dir = os.path.join(ANDROID_BUILD_TOP,
'out/development/ide/clion/art')
diff --git a/tools/jvmti-agents/breakpoint-logger/README.md b/tools/jvmti-agents/breakpoint-logger/README.md
index d7ffb34..101f277 100644
--- a/tools/jvmti-agents/breakpoint-logger/README.md
+++ b/tools/jvmti-agents/breakpoint-logger/README.md
@@ -5,7 +5,7 @@
# Usage
### Build
-> `make libbreakpointlogger` # or 'make libbreakpointloggerd' with debugging checks enabled
+> `m libbreakpointlogger` # or 'm libbreakpointloggerd' with debugging checks enabled
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
diff --git a/tools/jvmti-agents/dump-jvmti-state/README.md b/tools/jvmti-agents/dump-jvmti-state/README.md
index 4aabc08..c07a194 100644
--- a/tools/jvmti-agents/dump-jvmti-state/README.md
+++ b/tools/jvmti-agents/dump-jvmti-state/README.md
@@ -6,7 +6,7 @@
# Usage
### Build
-> `make libdumpjvmti`
+> `m libdumpjvmti`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
@@ -24,4 +24,4 @@
>
> `adb shell am start-activity --attach-agent /data/local/tmp/libdumpjvmti.so some.debuggable.apps/.the.app.MainActivity`
>
-> `adb shell kill -3 $(adb shell pidof some.debuggable.apps)`
\ No newline at end of file
+> `adb shell kill -3 $(adb shell pidof some.debuggable.apps)`
diff --git a/tools/jvmti-agents/field-counts/README.md b/tools/jvmti-agents/field-counts/README.md
index b43881c..15ff9d9 100644
--- a/tools/jvmti-agents/field-counts/README.md
+++ b/tools/jvmti-agents/field-counts/README.md
@@ -8,7 +8,7 @@
# Usage
### Build
-> `make libfieldcount libfieldcounts`
+> `m libfieldcount libfieldcounts`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
@@ -61,4 +61,4 @@
dalvikvm64 I 06-27 14:24:59 183155 183155 fieldcount.cc:155] Ldalvik/system/ClassExt;.jmethodIDs:Ljava/lang/Object; <ALL TYPES> 63 10008
dalvikvm64 I 06-27 14:24:59 183155 183155 fieldcount.cc:161] Ldalvik/system/ClassExt;.jmethodIDs:Ljava/lang/Object; <null> 26 0
dalvikvm64 I 06-27 14:24:59 183155 183155 fieldcount.cc:161] Ldalvik/system/ClassExt;.jmethodIDs:Ljava/lang/Object; [J 39 10008
-```
\ No newline at end of file
+```
diff --git a/tools/jvmti-agents/field-null-percent/README.md b/tools/jvmti-agents/field-null-percent/README.md
index c07c163..f4d38c2 100644
--- a/tools/jvmti-agents/field-null-percent/README.md
+++ b/tools/jvmti-agents/field-null-percent/README.md
@@ -7,7 +7,7 @@
# Usage
### Build
-> `make libfieldnull libfieldnulls`
+> `m libfieldnull libfieldnulls`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
diff --git a/tools/jvmti-agents/jit-load/README.md b/tools/jvmti-agents/jit-load/README.md
index 8aa4513..6efc33a 100644
--- a/tools/jvmti-agents/jit-load/README.md
+++ b/tools/jvmti-agents/jit-load/README.md
@@ -5,7 +5,7 @@
# Usage
### Build
-> `make libjitload` # or 'make libjitloadd' with debugging checks enabled
+> `m libjitload` # or 'm libjitloadd' with debugging checks enabled
The libraries will be built for 32-bit, 64-bit, host and target. Below examples assume you want to use the 64-bit version.
### Command Line
diff --git a/tools/jvmti-agents/list-extensions/README.md b/tools/jvmti-agents/list-extensions/README.md
index dffac95..976a8c3 100644
--- a/tools/jvmti-agents/list-extensions/README.md
+++ b/tools/jvmti-agents/list-extensions/README.md
@@ -5,7 +5,7 @@
# Usage
### Build
-> `make liblistextensions`
+> `m liblistextensions`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
@@ -53,4 +53,4 @@
> `adb shell am start-activity --attach-agent /data/local/tmp/liblistextensions.so some.debuggable.apps/.the.app.MainActivity`
#### RI
-> `java -agentpath:liblistextensions.so -cp tmp/helloworld/classes helloworld`
\ No newline at end of file
+> `java -agentpath:liblistextensions.so -cp tmp/helloworld/classes helloworld`
diff --git a/tools/jvmti-agents/simple-force-redefine/README.md b/tools/jvmti-agents/simple-force-redefine/README.md
index 362c704..254eaf6 100644
--- a/tools/jvmti-agents/simple-force-redefine/README.md
+++ b/tools/jvmti-agents/simple-force-redefine/README.md
@@ -7,7 +7,7 @@
# Usage
### Build
-> `make libforceredefine`
+> `m libforceredefine`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
@@ -30,4 +30,4 @@
> `adb shell am attach-agent $(adb shell pidof some.deubggable.app) /data/local/tmp/libforceredefine.so=/data/local/tmp/classlist`
One can also use fifos to send classes interactively to the process. (TODO: Have the agent
-continue reading from the fifo even after it gets an EOF.)
\ No newline at end of file
+continue reading from the fifo even after it gets an EOF.)
diff --git a/tools/jvmti-agents/ti-fast/README.md b/tools/jvmti-agents/ti-fast/README.md
index c8cf180..9178931 100644
--- a/tools/jvmti-agents/ti-fast/README.md
+++ b/tools/jvmti-agents/ti-fast/README.md
@@ -6,7 +6,7 @@
# Usage
### Build
-> `make libtifast`
+> `m libtifast`
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
diff --git a/tools/jvmti-agents/titrace/README.md b/tools/jvmti-agents/titrace/README.md
index a82025b..2bb9983 100644
--- a/tools/jvmti-agents/titrace/README.md
+++ b/tools/jvmti-agents/titrace/README.md
@@ -4,7 +4,7 @@
# Usage
### Build
-> `make libtitrace` # or 'make libtitraced' with debugging checks enabled
+> `m libtitrace` # or 'm libtitraced' with debugging checks enabled
The libraries will be built for 32-bit, 64-bit, host and target. Below examples assume you want to use the 64-bit version.
### Command Line
diff --git a/tools/jvmti-agents/wrapagentproperties/README.md b/tools/jvmti-agents/wrapagentproperties/README.md
index d968087..14894ad 100644
--- a/tools/jvmti-agents/wrapagentproperties/README.md
+++ b/tools/jvmti-agents/wrapagentproperties/README.md
@@ -5,7 +5,7 @@
# Usage
### Build
-> `make libwrapagentproperties` # or 'make libwrapagentpropertiesd' with debugging checks enabled
+> `m libwrapagentproperties` # or 'm libwrapagentpropertiesd' with debugging checks enabled
The libraries will be built for 32-bit, 64-bit, host and target. Below examples
assume you want to use the 64-bit version.
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 869f56d..e8f2c08 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -306,7 +306,7 @@
if [[ ! -f $test_jar ]]; then
echo "Before running, you must build jdwp tests and vogar:" \
- "make ${make_target_name} vogar"
+ "m ${make_target_name} vogar"
exit 1
fi
diff --git a/tools/veridex/README.md b/tools/veridex/README.md
index f85a51b..ab446c0 100644
--- a/tools/veridex/README.md
+++ b/tools/veridex/README.md
@@ -8,7 +8,7 @@
that do not exist. It can also miss on reflection uses.
To build it:
-> make appcompat
+> m appcompat
To run it:
> ./art/tools/veridex/appcompat.sh --dex-file=test.apk