Skip to content
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.

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

Added code to merge APKLIB manifests #135

Merged
merged 2 commits into from Oct 16, 2012
Merged

Conversation

tlbollwitt
Copy link
Contributor

HI,
I would like to submit some code to add the APKLIB manifest merging that is available with the sdk tools r20.

Here is an example of my POM settings. The resources plugin needs to be disabled for the process-resources phase, so the "default-resources" execution was added. Without this the non-merged manifest would get re-copied to the build directory.

    <plugins>
        <plugin>
            <artifactId>maven-resources-plugin</artifactId>
            <version>2.6</version>
            <executions>
                <execution>
                    <phase>initialize</phase>
                    <goals>
                        <goal>resources</goal>
                    </goals>
                </execution>
                <execution>
                    <id>default-resources</id>
                    <phase>DISABLED</phase>
                </execution>
            </executions>
        </plugin>
        <plugin>
            <groupId>com.jayway.maven.plugins.android.generation2</groupId>
            <artifactId>android-maven-plugin</artifactId>
            <configuration>
                <androidManifestFile>${project.build.directory}/AndroidManifest.xml</androidManifestFile>
                <mergeManifests>true</mergeManifests>
            </configuration>
            <extensions>true</extensions>
        </plugin>
    </plugins>

}
}

if ( libManifests.size() > 0 )
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!isEmpty() is probably easier to read.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I will make the change.

@tlbollwitt
Copy link
Contributor Author

Do you want me to perform a rebase of my changes once (if?) they are approved? I am not sure if you prefer to retain the commit history of revisions or not.

@holmes
Copy link

holmes commented Oct 13, 2012

I'm not a maintainer, just a fellow contributor waiting for a pull to get merged. Just thought I'd comment.

I haven't looked at the ApkBuilder to see what the status-quo looks like. If it's that interesting looking, I'd say leave it.

And I'd rebase now before you get anymore comments.

@mosabua
Copy link
Member

mosabua commented Oct 16, 2012

Could you please provide a full name and email or website for the changelog.

@mosabua
Copy link
Member

mosabua commented Oct 16, 2012

Also... I am pulling this in but we need the documentation from the pull request above either as part of the javadoc (preferred) or on a wiki page or so. Please send another pull request with that.

@mosabua mosabua merged commit 1e5aa67 into simpligility:master Oct 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants