Skip to content

Commit bee5818

Browse files
committed
Merge fix-refresh-reliability
2 parents 382a5f1 + 5049ac3 commit bee5818

2 files changed

Lines changed: 20 additions & 7 deletions

File tree

.mux/init

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ set -e
44
# Symlink untracked files from main repo for worktrees
55
MAIN_REPO="/home/benpotter/workspace/trmnl-nook-simple-touch"
66

7-
for props in local.properties project.properties; do
8-
if [ -f "$MAIN_REPO/$props" ]; then
9-
ln -sf "$MAIN_REPO/$props" "$props"
10-
echo "Linked $props"
11-
fi
12-
done
7+
# Only local.properties should be linked (machine-specific SDK path).
8+
# project.properties must be a real tracked file for CI.
9+
if [ -f "$MAIN_REPO/local.properties" ]; then
10+
ln -sf "$MAIN_REPO/local.properties" local.properties
11+
echo "Linked local.properties"
12+
fi
1313

1414
for jar in "$MAIN_REPO"/libs/*.jar; do
1515
if [ -f "$jar" ]; then

project.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

project.properties

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file is automatically generated by Android Tools.
2+
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3+
#
4+
# This file must be checked in Version Control Systems.
5+
#
6+
# To customize properties used by the Ant build system edit
7+
# "ant.properties", and override values to adapt the script to your
8+
# project structure.
9+
#
10+
# Project target.
11+
# NOTE: This is the *compile* target used by old ADT/Ant tooling. The app
12+
# still targets API 7 at runtime (see AndroidManifest.xml). We keep android-20
13+
# here because this ADT bundle only ships that platform and the build expects it.
14+
target=android-20

0 commit comments

Comments
 (0)