StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add android_sdk_repo_host to build platform-tools&build-tools

Browse Source 
The Android SDK has been built with Make up until now, monolithically,
then split up into several sdk-repo zip files for different purposes.
The Mac and Windows SDKs really only need to contain the platform-tools
and build-tools pieces, but due to this monolithic sdk zip, we had to
build the whole SDK first.

This adds an `android_sdk_repo_host` module that can build these
platform-tools and build-tools zips.

Bug: 187222815
Change-Id: I55809e1d7447dd65e22461f921b2b8abb6d5f822
This commit is contained in:
Dan Willemsen
2021-07-13 21:52:04 -07:00
parent 3e4d25552b
commit 9fe1410213
15 changed files with 586 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/androidmk.go
View File

@@ -60,6 +60,11 @@ func (library *Library) AndroidMkEntriesHostDex() android.AndroidMkEntries {
func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
var entriesList []android.AndroidMkEntries
if library.Os() == android.Windows {
// Make does not support Windows Java modules
return nil
}
if library.hideApexVariantFromMake {
// For a java library built for an APEX, we don't need a Make module for itself. Otherwise, it
// will conflict with the platform variant because they have the same module name in the
@@ -250,6 +255,10 @@ func (prebuilt *AARImport) AndroidMkEntries() []android.AndroidMkEntries {
}
func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries {
if binary.Os() == android.Windows {
// Make does not support Windows Java modules
return nil
}
if !binary.isWrapperVariant {
return []android.AndroidMkEntries{android.AndroidMkEntries{