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

Commit b83dfe24 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Stop supporting wrapping the build with `make`" am: d69e849c 

am: 93b7c1b5

Change-Id: Iabd504df24329930246322076a724bedf6af625e
parents 07173943 93b7c1b5

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -484,7 +484,6 @@ endif 
prebuilt_sdk_tools := prebuilts/sdk/tools

prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

prebuilt_build_tools_wrappers := prebuilts/build-tools/common/bin

prebuilt_build_tools_jars := prebuilts/build-tools/common/framework
@@ -542,7 +541,6 @@ DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod 
FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist

FILESLIST_UTIL :=$= build/make/tools/fileslist_util.py

HOST_INIT_VERIFIER := $(HOST_OUT_EXECUTABLES)/host_init_verifier

MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel

SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper

SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips

core/main.mk

+3 −16
Original line number Diff line number Diff line
@@ -10,22 +10,11 @@ SHELL := /bin/bash 
endif



ifndef KATI



host_prebuilts := linux-x86

ifeq ($(shell uname),Darwin)

host_prebuilts := darwin-x86

$(warning Calling make directly is no longer supported.)

$(warning Either use 'envsetup.sh; m' or 'build/soong/soong_ui.bash --make-mode')

$(error done)

endif



.PHONY: run_soong_ui

run_soong_ui:

	+@prebuilts/build-tools/$(host_prebuilts)/bin/makeparallel --ninja build/soong/soong_ui.bash --make-mode $(MAKECMDGOALS)



.PHONY: $(MAKECMDGOALS)

$(sort $(MAKECMDGOALS)) : run_soong_ui

	@#empty



else # KATI



$(info [1/1] initializing build system ...)



# Absolute path of the present working direcotry.
@@ -1897,5 +1886,3 @@ ndk: $(SOONG_OUT_DIR)/ndk.timestamp 
$(call dist-write-file,$(KATI_PACKAGE_MK_DIR)/dist.mk)



$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)
 


endif # KATI

core/ninja_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ PARSE_TIME_MAKE_GOALS := \ 
include $(wildcard vendor/*/build/ninja_config.mk)



# Any Android goals that need to be built.

ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\

ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS),\

    $(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS)))

# Goals we need to pass to Ninja.

NINJA_GOALS := $(filter-out $(NINJA_EXCLUDE_GOALS), $(ANDROID_GOALS))

tools/makeparallel/.gitignore

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
makeparallel

*.o

*.d

test.out

tools/makeparallel/Android.bp

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
// Copyright 2016 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.



cc_binary_host {

    name: "makeparallel",

    srcs: [

        "makeparallel.cpp",

    ],

    cflags: ["-Wall", "-Werror"],

}