Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
ci-tooling
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sysadmin
ci-tooling
Commits
d10e4a8c
Commit
d10e4a8c
authored
Apr 05, 2019
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android: Include then script files into the dockerfile
Otherwise they aren't accessible
parent
4f979428
Pipeline
#2242
skipped with stage
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
system-images/android/sdk/Dockerfile
system-images/android/sdk/Dockerfile
+2
-1
No files found.
system-images/android/sdk/Dockerfile
View file @
d10e4a8c
...
...
@@ -171,7 +171,8 @@ RUN sed -i.bak "s|#define QT_NO_DBUS|//#define QT_NO_DBUS //we install it sep
ENV
QMAKESPEC android-clang
RUN
/opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
COPY
build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project target-from-manifest.py target-from-appdata.py skip /opt/helpers/
COPY
build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args \
target-from-manifest.py target-from-appdata.py skip /opt/helpers/
RUN
sed
-i
.bak
's/android:minSdkVersion="16"/android:minSdkVersion="21"/g'
$QT_ANDROID
/src/android/templates/AndroidManifest.xml
\
&&
sed
-i
.bak
's/|density//g'
$QT_ANDROID
/src/android/templates/AndroidManifest.xml
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment