update java_path with java_home

Author: yunhanw-google

.github/workflows/java-tests.yaml

@@ -75,7 +75,7 @@ jobs:
               # TODO: this direct path loading is not maintainable. Our build system should define and
               #       support test classes.
               run: |
-                 $JAVA_PATH/bin/java \
+                 $JAVA_HOME/bin/java \
                    -cp 'third_party/java_deps/artifacts/*:out/linux-x64-tests/lib/src/controller/java/*' \
                    org.junit.runner.JUnitCore       \
                    matter.tlv.TlvWriterTest           \

build/chip/java/config.gni

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-java_path = getenv("JAVA_PATH")
+java_home = getenv("JAVA_HOME")
 declare_args() {
   java_matter_controller_dependent_paths = []
 
@@ -24,15 +24,15 @@ declare_args() {
   matter_enable_tlv_decoder_api = true
 
   matter_enable_java_compilation = false
-  if (java_path != "" && (current_os == "linux" || current_os == "mac")) {
-    java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
+  if (java_home != "" && (current_os == "linux" || current_os == "mac")) {
+    java_matter_controller_dependent_paths += [ "${java_home}/include/" ]
 
     if (current_os == "mac") {
       java_matter_controller_dependent_paths +=
-          [ "${java_path}/include/darwin/" ]
+          [ "${java_home}/include/darwin/" ]
     } else {
       java_matter_controller_dependent_paths +=
-          [ "${java_path}/include/linux/" ]
+          [ "${java_home}/include/linux/" ]
     }
 
     matter_enable_java_generated_api = false

build/chip/java/jar_runner.py

@@ -79,8 +79,8 @@ def FindCommand(command):
 
 
 def main():
-    java_path = FindCommand('jar')
-    if not java_path:
+    java_home = FindCommand('jar')
+    if not java_home:
         sys.stderr.write('jar: command not found\n')
         sys.exit(EXIT_FAILURE)
 
@@ -89,7 +89,7 @@ def main():
         sys.stderr.write('usage: %s [jar_args]...\n' % sys.argv[0])
         sys.exit(EXIT_FAILURE)
 
-    return subprocess.check_call([java_path] + args)
+    return subprocess.check_call([java_home] + args)
 
 
 if __name__ == '__main__':

build/chip/java/javac_runner.py

@@ -93,8 +93,8 @@ def ComputeClasspath(build_config_json):
 
 
 def main():
-    java_path = FindCommand('javac')
-    if not java_path:
+    java_home = FindCommand('javac')
+    if not java_home:
         sys.stderr.write('javac: command not found\n')
         sys.exit(EXIT_FAILURE)
 
@@ -123,7 +123,7 @@ def main():
 
     build_config_json = ReadBuildConfig(args.build_config)
     classpath = ComputeClasspath(build_config_json)
-    java_args = [java_path]
+    java_args = [java_home]
     if classpath:
         java_args += ["-classpath", classpath]
 

build/chip/java/rules.gni

@@ -22,7 +22,7 @@ jar_runner = "${chip_root}/build/chip/java/jar_runner.py"
 write_build_config = "${chip_root}/build/chip/java/write_build_config.py"
 
 assert(android_sdk_root != "" || matter_enable_java_compilation,
-       "android_sdk_root must be specified or JAVA_PATH must be set.")
+       "android_sdk_root must be specified or JAVA_HOME must be set.")
 
 # Declare a java library target
 #

examples/java-matter-controller/README.md

@@ -7,10 +7,11 @@ cluster requests to a Matter device
 
 <hr>
 
--   [Matter Controller Java App Example](#matter-controller-java-app-example)
-    -   [Requirements for building](#requirements-for-building)
-    -   [Preparing for build](#preparing-for-build)
-    -   [Building & Running the app](#building--running-the-app)
+- [Matter Controller Java App Example](#matter-controller-java-app-example)
+  - [Requirements for building](#requirements-for-building)
+    - [Linux](#linux)
+  - [Preparing for build](#preparing-for-build)
+  - [Building \& Running the app](#building--running-the-app)
 
 <hr>
 
@@ -95,7 +96,7 @@ export PATH="/usr/lib/kotlinc/bin:$PATH"
 ### Linux
 
 ```shell
-export JAVA_PATH=[JDK path]
+export JAVA_HOME=[JDK path]
 ```
 
 <hr>

examples/kotlin-matter-controller/README.md

@@ -5,10 +5,11 @@ control Matter accessory devices.
 
 <hr>
 
--   [Matter Controller Kotlin App Example](#matter-controller-kotlin-app-example)
-    -   [Requirements for building](#requirements-for-building)
-    -   [Preparing for build](#preparing-for-build)
-    -   [Building & Running the app](#building--running-the-app)
+- [Matter Controller Kotlin App Example](#matter-controller-kotlin-app-example)
+  - [Requirements for building](#requirements-for-building)
+    - [Linux](#linux)
+  - [Preparing for build](#preparing-for-build)
+  - [Building \& Running the app](#building--running-the-app)
 
 <hr>
 
@@ -82,7 +83,7 @@ export PATH="/usr/lib/kotlinc/bin:$PATH"
 ### Linux
 
 ```shell
-export JAVA_PATH=[JDK path]
+export JAVA_HOME=[JDK path]
 ```
 
 <hr>

scripts/build/builders/host.py

@@ -556,7 +556,7 @@ def SysRootPath(self, name):
 
     def generate(self):
         super(HostBuilder, self).generate()
-        if 'JAVA_PATH' in os.environ:
+        if 'JAVA_HOME' in os.environ:
             self._Execute(
                 ["third_party/java_deps/set_up_java_deps.sh"],
                 title="Setting up Java deps",

scripts/build/test.py

@@ -47,7 +47,7 @@ def build_actual_output(root: str, out: str, args: List[str]) -> List[str]:
         'NXP_K32W0_SDK_ROOT': 'TEST_NXP_K32W0_SDK_ROOT',
         'IMX_SDK_ROOT': 'IMX_SDK_ROOT',
         'TI_SYSCONFIG_ROOT': 'TEST_TI_SYSCONFIG_ROOT',
-        'JAVA_PATH': 'TEST_JAVA_PATH',
+        'JAVA_HOME': 'TEST_JAVA_HOME',
         'GSDK_ROOT': 'TEST_GSDK_ROOT',
         'WISECONNECT_SDK_ROOT': 'TEST_WISECONNECT_SDK_ROOT',
         'WIFI_SDK_ROOT': 'TEST_WIFI_SDK_ROOT',