Skip to content

Updates build files for Wear OS #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garanj merged 6 commits into from
Sep 8, 2025
Merged

Updates build files for Wear OS #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8298220
Updates build files for Wear OS
garanj Sep 8, 2025
c1d38e8
Fix invalid path
garanj Sep 8, 2025
3b53c6e
Fix release args
garanj Sep 8, 2025
37aa62c
Update gradle commands
garanj Sep 8, 2025
f7e4a6a
Update build commands
garanj Sep 8, 2025
52cd4c8
Refine scripts to include function reuse
garanj Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 54 additions & 38 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ set -e
# --- Configuration ---
# Get the script's directory.
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# Define the Android SDK version you want to target.
ANDROID_SDK_VERSION="36"
ANDROID_BUILD_TOOLS_VERSION="36.0.0"
Expand Down Expand Up @@ -93,49 +92,66 @@ chmod +x ./gradlew
echo "INFO: Cleaning the project..."
./gradlew clean -Pandroid.sdk.path=$ANDROID_HOME

# Build the production release bundle without generating a baseline profile.
echo "INFO: Building the production release bundle..."
# Build the production release bundles without generating baseline profiles.
echo "INFO: Building the Android production release bundle..."
./gradlew app:bundleRelease app:spdxSbomForRelease -x test -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true

echo "INFO: Building the Wear OS production release bundle..."
./gradlew wear:bundleRelease -x test -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true

# --- Artifact Collection ---
echo "INFO: Preparing artifacts for Kokoro..."

# Default output path for the bundle
AAB_SRC_DIR="app/build/outputs/bundle/release"
# The default name of the AAB for a release bundle
AAB_FILE="app-release.aab"
AAB_PATH="${AAB_SRC_DIR}/${AAB_FILE}"

# Check if the AAB exists
if [[ -f "$AAB_PATH" ]]; then
# Create a directory within Kokoro's artifact collection area
ARTIFACT_DEST_DIR="${KOKORO_ARTIFACTS_DIR}/artifacts"
mkdir -p "${ARTIFACT_DEST_DIR}"

# Copy the AAB
cp "${AAB_PATH}" "${ARTIFACT_DEST_DIR}/app-release-unsigned.aab"
echo "SUCCESS: AAB copied to ${ARTIFACT_DEST_DIR}"

# Find and list the files before copying
# Store the find results in a variable to avoid running find twice
# and to handle the case where no files are found gracefully.
intoto_files=$(find . -type f -name "*.intoto.jsonl")

if [ -n "$intoto_files" ]; then
echo "INFO: Found the following .intoto.jsonl files:"
echo "$intoto_files" # This will list each file on a new line
echo "INFO: Copying .intoto.jsonl files to ${ARTIFACT_DEST_DIR}/"
# Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${ARTIFACT_DEST_DIR}/"
# This function collects a specific AAB and its associated in-toto files.
# Arguments:
# $1: Source directory for the AAB (e.g., "app/build/outputs/bundle/release")
# $2: Source filename for the AAB (e.g., "app-release.aab")
# $3: Destination filename for the AAB (e.g., "app-release-unsigned.aab")
collect_artifacts() {
local aab_src_dir="$1"
local aab_file="$2"
local aab_dest_file="$3"
local aab_path="${aab_src_dir}/${aab_file}"

# Check if the AAB exists
if [[ -f "$aab_path" ]]; then
# Create a directory within Kokoro's artifact collection area
local artifact_dest_dir="${KOKORO_ARTIFACTS_DIR}/artifacts"
mkdir -p "${artifact_dest_dir}"

# Copy the AAB
cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
echo "SUCCESS: AAB copied to ${artifact_dest_dir}"

# Find and list the files before copying
# Store the find results in a variable to avoid running find twice
# and to handle the case where no files are found gracefully.
local intoto_files
intoto_files=$(find . -type f -name "*.intoto.jsonl")

if [ -n "$intoto_files" ]; then
echo "INFO: Found the following .intoto.jsonl files:"
echo "$intoto_files" # This will list each file on a new line
echo "INFO: Copying .intoto.jsonl files to ${artifact_dest_dir}/"
# Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${artifact_dest_dir}/"
else
echo "INFO: No .intoto.jsonl files found."
fi
else
echo "INFO: No .intoto.jsonl files found."
echo "FAILURE: AAB not found at ${aab_path}"
exit 1
fi
}

# Collect the main application artifacts
collect_artifacts "app/build/outputs/bundle/release" "app-release.aab" "app-release-unsigned.aab"

# Copy the app-specific SPDX SBOM
echo "INFO: Copying SPDX SBOM..."
cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"

echo "INFO: Copying SPDX SBOM..."
# The output file from app:spdxSbomForRelease is build/spdx/release.spdx.json
cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"
# Collect the Wear OS application artifacts
collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"

else
echo "FAILURE: AAB not found at ${AAB_PATH}"
exit 1
fi
exit 0
91 changes: 53 additions & 38 deletions build_presubmit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,51 +94,66 @@ chmod +x ./gradlew
echo "INFO: Cleaning the project..."
./gradlew clean -Pandroid.sdk.path=$ANDROID_HOME

# Build the production release bundle without generating a baseline profile.
echo "INFO: Building the production release bundle..."
# Build the production release bundles without generating baseline profiles.
echo "INFO: Building the Android production release bundle..."
./gradlew app:bundleRelease app:spdxSbomForRelease -x test -x uploadCrashlyticsMappingFileRelease -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true

echo "INFO: Building the Wear OS production release bundle..."
./gradlew wear:bundleRelease -x test -x uploadCrashlyticsMappingFileRelease -Pandroid.sdk.path=$ANDROID_HOME -PCI_BUILD=true

# --- Artifact Collection ---
echo "INFO: Preparing artifacts for Kokoro..."

# Default output path for the bundle
AAB_SRC_DIR="app/build/outputs/bundle/release"
# The default name of the AAB for a release bundle
AAB_FILE="app-release.aab"
AAB_PATH="${AAB_SRC_DIR}/${AAB_FILE}"

# Check if the AAB exists
if [[ -f "$AAB_PATH" ]]; then
# Create a directory within Kokoro's artifact collection area
ARTIFACT_DEST_DIR="${KOKORO_ARTIFACTS_DIR}/artifacts"
mkdir -p "${ARTIFACT_DEST_DIR}"

# Copy the AAB
cp "${AAB_PATH}" "${ARTIFACT_DEST_DIR}/app-release-unsigned.aab"
echo "SUCCESS: AAB copied to ${ARTIFACT_DEST_DIR}"

# Find and list the files before copying
# Store the find results in a variable to avoid running find twice
# and to handle the case where no files are found gracefully.
intoto_files=$(find . -type f -name "*.intoto.jsonl")

if [ -n "$intoto_files" ]; then
echo "INFO: Found the following .intoto.jsonl files:"
echo "$intoto_files" # This will list each file on a new line
echo "INFO: Copying .intoto.jsonl files to ${ARTIFACT_DEST_DIR}/"
# Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${ARTIFACT_DEST_DIR}/"
# This function collects a specific AAB and its associated in-toto files.
# Arguments:
# $1: Source directory for the AAB (e.g., "app/build/outputs/bundle/release")
# $2: Source filename for the AAB (e.g., "app-release.aab")
# $3: Destination filename for the AAB (e.g., "app-release-unsigned.aab")
collect_artifacts() {
local aab_src_dir="$1"
local aab_file="$2"
local aab_dest_file="$3"
local aab_path="${aab_src_dir}/${aab_file}"

# Check if the AAB exists
if [[ -f "$aab_path" ]]; then
# Create a directory within Kokoro's artifact collection area
local artifact_dest_dir="${KOKORO_ARTIFACTS_DIR}/artifacts"
mkdir -p "${artifact_dest_dir}"

# Copy the AAB
cp "${aab_path}" "${artifact_dest_dir}/${aab_dest_file}"
echo "SUCCESS: AAB copied to ${artifact_dest_dir}"

# Find and list the files before copying
# Store the find results in a variable to avoid running find twice
# and to handle the case where no files are found gracefully.
local intoto_files
intoto_files=$(find . -type f -name "*.intoto.jsonl")

if [ -n "$intoto_files" ]; then
echo "INFO: Found the following .intoto.jsonl files:"
echo "$intoto_files" # This will list each file on a new line
echo "INFO: Copying .intoto.jsonl files to ${artifact_dest_dir}/"
# Use print0 and xargs -0 for safe handling of filenames with spaces or special characters
find . -type f -name "*.intoto.jsonl" -print0 | xargs -0 -I {} cp {} "${artifact_dest_dir}/"
else
echo "INFO: No .intoto.jsonl files found."
fi
else
echo "INFO: No .intoto.jsonl files found."
echo "FAILURE: AAB not found at ${aab_path}"
exit 1
fi
}

# Collect the main application artifacts
collect_artifacts "app/build/outputs/bundle/release" "app-release.aab" "app-release-unsigned.aab"

echo "INFO: Copying SPDX SBOM..."
# The output file from app:spdxSbomForRelease is build/spdx/release.spdx.json
cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"
# Copy the app-specific SPDX SBOM
echo "INFO: Copying SPDX SBOM..."
cp app/build/spdx/release.spdx.json "${KOKORO_ARTIFACTS_DIR}/artifacts/app-release.spdx.json"

else
echo "FAILURE: AAB not found at ${AAB_PATH}"
exit 1
fi
# Collect the Wear OS application artifacts
collect_artifacts "wear/build/outputs/bundle/release" "wear-release.aab" "wear-release-unsigned.aab"

exit 0
exit 0
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
# build
appVersionCode = "5"
appVersionName = "1.1.3"
appVersionCode = "6"
appVersionName = "1.1.4"
agp = "8.11.1"
bcpkixJdk18on = "1.81"
compileSdk = "36"
Expand Down