commit 5859799ce6ad57ee862434603fc29cecfec1d775
author Chris Wailes <chriswailes@google.com> Tue Oct 29 15:39:06 2019 -0700
committer Orion Hodson <oth@google.com> Thu Oct 31 12:58:10 2019 +0000
tree d3262224fbd1f166084ef1a694f8b4aea6f3f228
parent 8e23d38035fe04ffab8b89c348b5b178bd8c492e

Updating the CMake generator.

This commit updates the CMake generator for ART so that it can properly
find and invoke the build command (`m`).

(cherry picked from commit bff79014ad3da04d9c298ac8681b25415680fb52)

Test: ./tools/generate_cmake_lists.py --project-name art --arch x86_64-linux_glibc
Change-Id: I448f453ab0f98fb1433aada323a940805c10b972
Merged-In: I448f453ab0f98fb1433aada323a940805c10b972

tools/generate_cmake_lists.py

diff --git a/tools/generate_cmake_lists.py b/tools/generate_cmake_lists.py
index 5639617..b19c292 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('m -j64', shell=True, cwd=ANDROID_BUILD_TOP)
+  subprocess.check_output('build/soong/soong_ui.bash --make-mode', shell=True, cwd=ANDROID_BUILD_TOP)
 
   out_art_cmakelists_dir = os.path.join(ANDROID_BUILD_TOP,
                                         'out/development/ide/clion/art')