Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b58b455 authored by Dan Willemsen's avatar Dan Willemsen Committed by Automerger Merge Worker
Browse files

Merge "Reduce modules exposed to Make in Mac builds" am: 2a109db1 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1860355

Change-Id: Icf9381c2abf64c28c4dda77bccef8c8e26e4dbd0
parents 7040352e 2a109db1

android/androidmk.go

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import ( 
	"os"

	"path/filepath"

	"reflect"

	"runtime"

	"sort"

	"strings"
@@ -902,6 +903,13 @@ func shouldSkipAndroidMkProcessing(module *ModuleBase) bool { 
		return true

	}



	// On Mac, only expose host darwin modules to Make, as that's all we claim to support.

	// In reality, some of them depend on device-built (Java) modules, so we can't disable all

	// device modules in Soong, but we can hide them from Make (and thus the build user interface)

	if runtime.GOOS == "darwin" && module.Os() != Darwin {

		return true

	}



	return !module.Enabled() ||

		module.commonProperties.HideFromMake ||

		// Make does not understand LinuxBionic

android/androidmk_test.go

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import ( 
	"fmt"

	"io"

	"reflect"

	"runtime"

	"strings"

	"testing"
@@ -155,6 +156,11 @@ func buildContextAndCustomModuleFoo(t *testing.T, bp string) (*TestContext, *cus 
}



func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testing.T) {

	if runtime.GOOS == "darwin" {

		// Device modules are not exported on Mac, so this test doesn't work.

		t.SkipNow()

	}



	bp := `

	custom {

		name: "foo",

cmd/multiproduct_kati/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -31,4 +31,14 @@ blueprint_go_binary { 
    testSrcs: [

        "main_test.go",

    ],

    linux: {

        srcs: [

            "main_linux.go",

        ],

    },

    darwin: {

        srcs: [

            "main_darwin.go",

        ],

    },

}

cmd/multiproduct_kati/main.go

+0 −9
Original line number Diff line number Diff line
@@ -166,15 +166,6 @@ type mpContext struct { 
	MainLogsDir string

}



func detectTotalRAM() uint64 {

	var info syscall.Sysinfo_t

	err := syscall.Sysinfo(&info)

	if err != nil {

		panic(err)

	}

	return info.Totalram * uint64(info.Unit)

}



func findNamedProducts(soongUi string, log logger.Logger) []string {

	cmd := exec.Command(soongUi, "--dumpvars-mode", "--vars=all_named_products")

	output, err := cmd.Output()

cmd/multiproduct_kati/main_darwin.go

0 → 100644
+20 −0
Original line number Diff line number Diff line 
// Copyright 2017 Google Inc. All rights reserved.

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package main



func detectTotalRAM() uint64 {

	// unimplemented stub on darwin

	return 0

}