[Bug 526437] - Android SWT Libraries need to be forked #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Forked AOSP SWT according to "How to fork Android on GitHub" (https://www.bitleaks.net/blog/fork-android-on-github/). This project was revised to build the dependencies required by Andmore as bundles using Maven/Tycho. The relevant parts were then merged to Andmore as a new trunk named "andmore-swt". The enlarged Andmore project has built to completion with Maven, but with integration test errors. Regardless, the pull request is proceeding, as the android-swt part of the build is successful. Note the orginal Andmore target has been updated and incorporated in the Tycho target platform configuration so both Maven and Eclipse can share the same target. Also note that the original Android base module has been replaced by the new SWT org.eclipse.andmore.swt module. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437 Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
1. Fixed relative paths to parent pom in andmore-swt feature poms
2. Adjusted target file to reduce early workbench load errors
3. Added missing library jar dependency jar download in ddmuilib pom
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437
Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
Replaced sdkuilib module with one rewritten to work with Android API 25 libraries. This required bringing all of Andmore up to API 25 and hence merged changes from separate branch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=525493 Merged Matthew Piggott branch android-n.1 from https://github.com/mpiggott/andmore.git. (next 5 changes) Updated Android SDK version to 25.3.3, lint libraries included. Modified android-core "adt" module for bug 525493 "Projects containing aar libraries currently fail with robolectric 3.2.1" Replaced DexWrapper with JDT Java application launch. Removed legacy SWT jars Updated compile source and Java execution configuration settings universally to JavaSE-1.8. Transferred ADT module IDE windows for SDK packages and devices to sdkuilib. Note AdtUpdateDialog for installing individual packages is incomplete, impacting new project and new installation wizards. Replaced all code for loading images to comply with Eclipse best practice. In this process image files were relocated to dedicated bundle directories. Removed all jar files from distribution which are available online. Maven now downloads them on "initialize" goal. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437 Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
1. Add Generic Category to Package Updater window 2. Add missing "Samples" PackageType 3. Add PackageFilter class to filter categories and package items according to package type 4. Add label to each PackageType enum for user package type selection 5. Add Package Updater option to select all new packages. Default is show only latest new packages. 6. On updater window, hilight obsolete checkbox when selected, add "obsolete" to affected package names and apply alert image 7. Extract version from package path, if appended and show this as package revision. 8. Remove version from package display name, if appended. 9. Add "Package Types..." and "Cancel" buttons to Package Updater window 10. Add handling of invalid Android SDK path setting in Package Updater window 11. Adjust Package Updater window column widths and change "Rev," to "Revision" 12. Change SwtBaseDialog to resize after setting contents 13. Convert SWT task framework to work asynchronously, executing tasks in jobs instead of threads 14. Add a "onTerminateTask" parameter to ITaskFactory to call back when the job is done 15. Add PackageInstaller and PackageInstallTask classes to encapsulate the package install steps 16. Add PackageInstallListener interface to call back on package install termination 17. Update SdkTargets class to associate targets with system images using AndroidTargetHash.getPlatformHashString() 18. Remove legacy code vestiges including disposal of image factories 19. Filter out duplicates which appear in the list of package dependencies produced by sdklib code 20. In AVD Manager, restrict target selection to only those targets with installed system images 21. Fix missing default AVD folder setting in AvdCreationPresenter 22. Add OK button to AVD Manager 23. Color ToggleButton background to make it look more like a button 24. Remove onSdkLoaded() event from ISdkChangeListener as it had no usage 25. Delay broadcast of ISdkChangeListener onSdkReload() event until updater window is closed 26. Complete design of AdtUpdateDialog to enhance user experience and enlist same package install code as used by updater window 27. Fix NPE in SdkTargetSelector and AVD manager caused by Target implementation change 28. Add image factory SdkUserInterfacePlugin and delegate it to dispose of the image factory 29. Add support to SdkContext for changing SDK location 30. Add to SdkHelper all ISdkChangeListener event broadcasts 31. Reinstate SdkManagerAction ISdkChangeListener events 32. Remove call to VersionCheck which fails for API27 because library file "plugin.prop" has disappeared 33. Two minor link check corrections for API25 and update of LintJob to workaround Eclipse projects not having "testsources" 34. Relocate commons-compress jar from sdkuilib module to swt module to fix classpath issue impacting package install 35. Fix spurious popup when cancelling AVD edit page Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437 Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git-commit3.txt
Uploading andmore-swt-git.txt…
Forked AOSP SWT according to "How to fork Android on GitHub"
(https://www.bitleaks.net/blog/fork-android-on-github/).
This project was revised to build the dependencies required by Andmore
as bundles using Maven/Tycho. The relevant parts were then merged to
Andmore as a new trunk named "andmore-swt". The enlarged Andmore project
has built to completion with Maven, but with integration test errors.
Regardless, the pull request is proceeding, as the android-swt part of
the build is successful.
Note the orginal Andmore target has been updated and incorporated in the
Tycho target platform configuration so both Maven and Eclipse can share
the same target.
Also note that the original Android base module has been replaced by the
new SWT org.eclipse.andmore.swt module.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437
Signed-off-by: Andrew Bowley andrewbowley@aapt.net.au