mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-07 06:09:57 +03:00
Revert "Add minimal setup for Go codegen in Android.bp."
This reverts commit 9f7b6babe1.
Reason for revert: No longer appears needed as 1) number of diffs was greatly reduced via cc_default 2) build configs got simpler with switching to platform zlib. No recent conflicts introduced by build scripts
Original change's description:
> Add minimal setup for Go codegen in Android.bp.
>
> Based on Cody's http://ag/19603310.
>
> Only adds libEGL_angle_codegen to libEGL_angle and is a no-op.
>
> Tested in an aosp checkout. Hopefully this doesn't cause merge conflicts
> with internal master as all diffs are close to the top of the file.
>
> Android.bp diff: https://paste.googleplex.com/6626641357832192
>
> Bug: b/242929755
> Change-Id: I6d7ac9f3dd502074c41838bd1aa10075a8c99145
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3876890
> Commit-Queue: Roman Lavrov <romanl@google.com>
> Reviewed-by: Cody Northrop <cnorthrop@google.com>
> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Bug: b/242929755
Change-Id: Id4cbdf68e9704138396ee1bef7a4f1edef3f50cf
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4685320
Commit-Queue: Roman Lavrov <romanl@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
//
|
||||
// Copyright 2022 The ANGLE Project Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
//
|
||||
package angle_android_codegen
|
||||
|
||||
import (
|
||||
"android/soong/android"
|
||||
"android/soong/cc"
|
||||
)
|
||||
|
||||
func init() {
|
||||
android.RegisterModuleType(
|
||||
"angle_android_codegen", angle_android_codegen_DefaultsFactory)
|
||||
}
|
||||
|
||||
// Values passed in from Android.bp
|
||||
type angle_android_codegen_Properties struct {
|
||||
}
|
||||
|
||||
func angle_android_codegen_Defaults(g *angle_android_codegen_Properties) func(ctx android.LoadHookContext) {
|
||||
return func(ctx android.LoadHookContext) {
|
||||
|
||||
// Structure to write out new values
|
||||
type props struct {
|
||||
}
|
||||
|
||||
p := &props{}
|
||||
|
||||
ctx.AppendProperties(p)
|
||||
}
|
||||
}
|
||||
|
||||
func angle_android_codegen_DefaultsFactory() android.Module {
|
||||
module := cc.DefaultsFactory()
|
||||
props := &angle_android_codegen_Properties{}
|
||||
module.AddProperties(props)
|
||||
android.AddLoadHook(module, angle_android_codegen_Defaults(props))
|
||||
return module
|
||||
}
|
||||
@@ -20,10 +20,6 @@ ROOT_TARGETS = [
|
||||
"//:libEGL",
|
||||
]
|
||||
|
||||
CODEGEN_TARGETS = [
|
||||
"//:libEGL",
|
||||
]
|
||||
|
||||
MIN_SDK_VERSION = '28'
|
||||
TARGET_SDK_VERSION = '33'
|
||||
STL = 'libc++_static'
|
||||
@@ -226,10 +222,6 @@ def gn_deps_to_blueprint_deps(abi, target, build_info):
|
||||
if 'deps' not in target_info:
|
||||
return static_libs, defaults
|
||||
|
||||
if target in CODEGEN_TARGETS:
|
||||
target_name = gn_target_to_blueprint_target(target, target_info)
|
||||
defaults.append(target_name + '_android_codegen')
|
||||
|
||||
for dep in target_info['deps']:
|
||||
if dep not in target_blockist and (not dep.startswith('//third_party') or any(
|
||||
dep.startswith(substring) for substring in third_party_target_allowlist)):
|
||||
@@ -582,17 +574,6 @@ def main():
|
||||
|
||||
blueprint_targets = []
|
||||
|
||||
blueprint_targets.append(('bootstrap_go_package', {
|
||||
'name': 'soong-angle-codegen',
|
||||
'pkgPath': 'android/soong/external/angle',
|
||||
'deps': [
|
||||
'blueprint', 'blueprint-pathtools', 'soong', 'soong-android', 'soong-cc',
|
||||
'soong-genrule'
|
||||
],
|
||||
'srcs': ['scripts/angle_android_codegen.go'],
|
||||
'pluginFor': ['soong_build'],
|
||||
}))
|
||||
|
||||
blueprint_targets.append((
|
||||
'cc_defaults',
|
||||
{
|
||||
@@ -609,12 +590,7 @@ def main():
|
||||
}))
|
||||
|
||||
for target in reversed(targets_to_write.keys()):
|
||||
blueprint_type, bp = gn_target_to_blueprint(target, build_info)
|
||||
if target in CODEGEN_TARGETS:
|
||||
blueprint_targets.append(('angle_android_codegen', {
|
||||
'name': bp['name'] + '_android_codegen',
|
||||
}))
|
||||
blueprint_targets.append((blueprint_type, bp))
|
||||
blueprint_targets.append(gn_target_to_blueprint(target, build_info))
|
||||
|
||||
# Add license build rules
|
||||
blueprint_targets.append(('package', {
|
||||
|
||||
Reference in New Issue
Block a user