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

Commit b604cf3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove deprecated Goma makefiles" into main

parents c80e7eeb fe9aaa23
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ include $(BUILD_SYSTEM)/combo/javac.mk

ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ccache.mk
include $(BUILD_SYSTEM)/goma.mk
include $(BUILD_SYSTEM)/rbe.mk
endif

core/goma.mk

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line
#
# Copyright (C) 2015 The Android Open Source Project
#
# 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.
#

# Notice: this works only with Google's Goma build infrastructure.
ifneq ($(filter-out false,$(USE_GOMA)),)
  ifdef GOMA_DIR
    goma_dir := $(GOMA_DIR)
  else
    goma_dir := $(HOME)/goma
  endif
  GOMA_CC := $(goma_dir)/gomacc

  # Append gomacc to existing *_WRAPPER variables so it's possible to
  # use both ccache and gomacc.
  CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
  CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
  # b/143658984: goma can't handle the --system argument to javac
  #JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC))

  goma_dir :=
endif