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

Commit f3612796 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents df58c69c da4bb609
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
name: build

runs:
    using: composite

    steps:
    - name: Install dependencies
      shell: bash
      run: sudo apt -y install libxml2-utils

    - name: Validate apns-conf.xml
      shell: bash
      run: xmllint --noout --schema ./tools/apns-conf.xsd ./prebuilt/common/etc/apns-conf.xml

    - name: Validate sensitive_pn.xml
      shell: bash
      run: xmllint --noout --schema ./spn/SpnInfo.xsd ./prebuilt/common/etc/sensitive_pn.xml
+38 −0
Original line number Diff line number Diff line
name: gerrit checks

on:
  workflow_dispatch:
    inputs:
      ref:
        type: string
      gerrit-ref:
        type: string
      change:
        type: string

jobs:
  build:
    runs-on: ubuntu-latest
    steps:
    - uses: lineageos-infra/fetch-gerrit-change@main
      with:
        gerrit-ref: ${{ inputs.gerrit-ref }}
        ref: ${{ inputs.ref }}

    - name: Check if build/action.yml exists
      id: check
      run: |
        if [ -f ./.github/workflows/build/action.yml ]; then
          echo "run=1" >> "$GITHUB_OUTPUT"
        fi

    - name: Build
      if: ${{ steps.check.outputs.run }}
      uses: ./.github/workflows/build

    - uses: lineageos-infra/gerrit-vote@main
      if: ${{ steps.check.outputs.run && always() }}
      with:
        auth: ${{ secrets.GERRIT_VOTE_CREDS }}
        change: ${{ inputs.change }}
        ref: ${{ inputs.ref }}
+7 −0
Original line number Diff line number Diff line
prebuilt_etc_xml {
    name: "apns-conf.xml",
    product_specific: true,
    src: "etc/apns-conf.xml",
    schema: ":apns-conf-schema",
}

prebuilt_etc_xml {
    name: "sensitive_pn.xml",
    product_specific: true,

prebuilt/common/Android.mk

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)

################################
# Copies the APN list file into $(TARGET_COPY_OUT_PRODUCT)/etc for the product as apns-conf.xml.
# In the case where $(CUSTOM_APNS_FILE) is defined, the content of $(CUSTOM_APNS_FILE)
# is added or replaced to the $(DEFAULT_APNS_FILE).
include $(CLEAR_VARS)

LOCAL_MODULE := apns-conf.xml
LOCAL_MODULE_CLASS := ETC

DEFAULT_APNS_FILE := vendor/lineage/prebuilt/common/etc/apns-conf.xml

ifdef CUSTOM_APNS_FILE
CUSTOM_APNS_SCRIPT := vendor/lineage/tools/custom_apns.py
FINAL_APNS_FILE := $(local-generated-sources-dir)/apns-conf.xml

$(FINAL_APNS_FILE): PRIVATE_SCRIPT := $(CUSTOM_APNS_SCRIPT)
$(FINAL_APNS_FILE): PRIVATE_CUSTOM_APNS_FILE := $(CUSTOM_APNS_FILE)
$(FINAL_APNS_FILE): $(CUSTOM_APNS_SCRIPT) $(DEFAULT_APNS_FILE)
	rm -f $@
	python $(PRIVATE_SCRIPT) $@ $(PRIVATE_CUSTOM_APNS_FILE)
else
FINAL_APNS_FILE := $(DEFAULT_APNS_FILE)
endif

LOCAL_PREBUILT_MODULE_FILE := $(FINAL_APNS_FILE)

LOCAL_PRODUCT_MODULE := true

include $(BUILD_PREBUILT)
+109 −109

File changed.

Preview size limit exceeded, changes collapsed.

Loading