Update logic for finding (or provide) apkanalyzer

Author: AliSoftware

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_send_app_size_metrics.rb

@@ -26,7 +26,7 @@ def self.run(params)
         # Add device-specific 'splits' metrics to the payload if a `:include_split_sizes` is enabled
         if params[:include_split_sizes]
           check_bundletool_installed!
-          apkanalyzer_bin = find_apkanalyzer_binary!
+          apkanalyzer_bin = params[:apkanalyzer_binary] || find_apkanalyzer_binary!
           UI.message("[App Size Metrics] Generating the various APK splits from #{params[:aab_path]}...")
           Dir.mktmpdir('release-toolkit-android-app-size-metrics') do |tmp_dir|
             Action.sh('bundletool', 'build-apks', '--bundle', params[:aab_path], '--output-format', 'DIRECTORY', '--output', tmp_dir)
@@ -61,10 +61,18 @@ def self.check_bundletool_installed!
         raise
       end
 
-      def self.find_apkanalyzer_binary!
+      def self.find_apkanalyzer_binary
         sdk_root = ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_HOME']
-        apkanalyzer_bin = sdk_root.nil? ? Action.sh('command', '-v', 'apkanalyzer') : File.join(sdk_root, 'cmdline-tools', 'latest', 'bin', 'apkanalyzer')
-        UI.user_error!('Unable to find apkanalyzer executable. Make sure you installed the Android SDK Command-line Tools') unless File.executable?(apkanalyzer_bin)
+        if sdk_root
+          pattern = File.join(sdk_root, 'cmdline-tools', '{latest,tools}', 'bin', 'apkanalyzer')
+          apkanalyzer_bin = Dir.glob(pattern).find { |path| File.executable?(path) }
+        end
+        apkanalyzer_bin || Action.sh('command', '-v', 'apkanalyzer', print_command_output: false) { |_| nil }
+      end
+
+      def self.find_apkanalyzer_binary!
+        apkanalyzer_bin = find_apkanalyzer_binary
+        UI.user_error!('Unable to find `apkanalyzer` executable in `$PATH` nor `$ANDROID_SDK_ROOT`. Make sure you installed the Android SDK Command-line Tools') if apkanalyzer_bin.nil?
         apkanalyzer_bin
       end
 
@@ -170,6 +178,17 @@ def self.available_options
             type: FastlaneCore::Boolean,
             default_value: true
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :apkanalyzer_binary,
+            env_name: 'FL_ANDROID_SEND_APP_SIZE_METRICS_APKANALYZER_BINARY',
+            description: 'The path to the `apkanalyzer` binary to use. If not provided explicitly, we will use `$PATH` and `$ANDROID_SDK_HOME` to try to find it',
+            type: String,
+            default_value: find_apkanalyzer_binary,
+            default_value_dynamic: true,
+            verify_block: proc do |value|
+              UI.user_error!('You must provide a path to an existing executable for `apkanalyzer`') unless File.executable?(value)
+            end
+          ),
         ]
       end
 

spec/android_send_app_size_metrics_spec.rb

@@ -13,8 +13,8 @@ def test_app_size_action(fake_aab_size:, fake_apks:, expected_payload:, **other_
 
       if other_action_args[:include_split_sizes] != false
         # Arrange: fake that apkanalyzer exists
-        ENV['ANDROID_SDK_ROOT'] = '__ANDROID_SDK_ROOT__FOR_TESTS__'
         apkanalyzer_bin = File.join('__ANDROID_SDK_ROOT__FOR_TESTS__', 'cmdline-tools', 'latest', 'bin', 'apkanalyzer')
+        allow(described_class).to receive(:find_apkanalyzer_binary).and_return(apkanalyzer_bin)
         allow(File).to receive(:executable?).with(apkanalyzer_bin).and_return(true)
 
         # Arrange: fake that bundletool exists and mock its call to create fake apks with corresponding apkanalyzer calls mocks