From 93564b3f8be7506dbd9941ebc4fbdbf575f4beb4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 11 Feb 2019 17:52:39 +0100 Subject: [PATCH] CMake: pro2cmake.py: Treat ANDROID_EMBEDDED as ANDROID Treat ANDROID_EMBEDDED as ANDROID when simplifying conditions. Change-Id: I2cf0ea1e1a3e882e3a7b7276867dcee452866ade Reviewed-by: Kevin Funk --- util/cmake/pro2cmake.py | 1 + 1 file changed, 1 insertion(+) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 13ee97cf00c..f18abcc81fb 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -943,6 +943,7 @@ def _recursive_simplify(expr): expr = _simplify_flavors_in_condition('APPLE', apples, expr) expr = _simplify_flavors_in_condition('BSD', bsds, expr) expr = _simplify_flavors_in_condition('UNIX', unixes, expr) + expr = _simplify_flavors_in_condition('ANDROID', ('ANDROID_EMBEDDED',), expr) # Now simplify further: expr = simplify_logic(expr)