Merge pull request #1220 from ifarbod/fix-androidproj-apilevel

Implement the androidapilevel() API in Android packaging projects
This commit is contained in:
Samuel Surtees 2019-01-10 22:19:32 +10:00 committed by GitHub
commit 698f343ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -84,6 +84,7 @@
local elements = oldfn(cfg)
if cfg.kind == p.ANDROIDPROJ then
elements = {
android.androidAPILevel,
vc2010.useDebugLibraries,
}
end
@ -156,7 +157,7 @@
-- below. Otherwise the function will use target seperator which
-- could be '\\' and result in failure to create links.
local fname = path.translate(file.relpath, '/')
-- Files that live outside of the project tree need to be "linked"
-- and provided with a project relative pseudo-path. Check for any
-- leading "../" sequences and, if found, remove them and mark this