Android/vendor_gapps
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setup-makefiles: Rename variables to please extract-tools

Browse Source
This commit is contained in:
Alessandro Astone
2022-03-11 18:33:46 +01:00
parent 2f2c2296f5
commit 59bcb4c6d5
17 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arm/Android.bp
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is generated by device/gapps//setup-makefiles.sh * This file is generated by device/gapps/arm/setup-makefiles.sh
*/ */
soong_namespace { soong_namespace {

4
arm/Android.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter arm,$(TARGET_ARCH)),) ifeq ($(TARGET_ARCH),arm)
endif endif

2
arm/BoardConfigVendor.mk
View File

@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh

4
arm/arm-vendor.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/gapps/ vendor/gapps/arm
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so

2
arm64/Android.bp
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is generated by device/gapps//setup-makefiles.sh * This file is generated by device/gapps/arm64/setup-makefiles.sh
*/ */
soong_namespace { soong_namespace {

4
arm64/Android.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter arm64,$(TARGET_ARCH)),) ifeq ($(TARGET_ARCH),arm64)
endif endif

2
arm64/BoardConfigVendor.mk
View File

@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh

4
arm64/arm64-vendor.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/gapps/ vendor/gapps/arm64
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so \ vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so \

2
common/Android.bp
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is generated by device/gapps//setup-makefiles.sh * This file is generated by device/gapps/common/setup-makefiles.sh
*/ */
soong_namespace { soong_namespace {

2
common/Android.mk
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)

2
common/BoardConfigVendor.mk
View File

@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh

4
common/common-vendor.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/gapps/ vendor/gapps/common
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.dialer.support.xml \ vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.google.android.dialer.support.xml \

14
setup-makefiles.sh
View File

@@ -20,7 +20,7 @@ set -e
export INITIAL_COPYRIGHT_YEAR=2017 export INITIAL_COPYRIGHT_YEAR=2017
export GAPPS_COMMON=common export DEVICE_COMMON=common
export VENDOR=gapps export VENDOR=gapps
# Load extract_utils and do some sanity checks # Load extract_utils and do some sanity checks
@@ -37,7 +37,7 @@ fi
. "$HELPER" . "$HELPER"
# Initialize the helper for common gapps # Initialize the helper for common gapps
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" true setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
# Copyright headers # Copyright headers
write_headers "arm arm64 x86" write_headers "arm arm64 x86"
@@ -55,19 +55,19 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
# We are done with common # We are done with common
write_footers write_footers
for TARGET in arm arm64 x86; do for DEVICE in arm arm64 x86; do
# Reinitialize the helper for target gapps # Reinitialize the helper for target gapps
setup_vendor "$TARGET" "$VENDOR" "$LINEAGE_ROOT" true setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT"
# Copyright headers and guards # Copyright headers and guards
write_headers "$TARGET" write_headers "$DEVICE"
write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt
# Gapps that are too large for grouper # Gapps that are too large for grouper
echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK" echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt
echo "endif" >> "$PRODUCTMK" echo "endif" >> "$PRODUCTMK"
printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK" printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"

2
x86/Android.bp
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is generated by device/gapps//setup-makefiles.sh * This file is generated by device/gapps/x86/setup-makefiles.sh
*/ */
soong_namespace { soong_namespace {

4
x86/Android.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter x86,$(TARGET_ARCH)),) ifeq ($(TARGET_ARCH),x86)
endif endif

2
x86/BoardConfigVendor.mk
View File

@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh

4
x86/x86-vendor.mk
View File

@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file is generated by device/gapps//setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/gapps/ vendor/gapps/x86
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libjni_latinimegoogle.so