From f69583941c873506b017bd5f5a81a3dfe15d7e22 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 30 Jan 2023 21:19:33 +0800 Subject: Update Android port * cross/ndk-build/ndk-build-shared-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1)))): * cross/ndk-build/ndk-build-static-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1)))): Revert broken typo fixes. * src/sfnt.c (TEST_STATIC): Define ARRAYELTS. (sfnt_table_names): New CVT and FPGM tables. (sfnt_decompose_compound_glyph, sfnt_decompose_glyph) (struct sfnt_large_integer, sfnt_multiply_divide_1) (sfnt_count_leading_zero_bits, sfnt_multiply_divide_2) (sfnt_multiply_divide, sfnt_mul_fixed, sfnt_div_fixed) (sfnt_ceil_fixed, sfnt_build_glyph_outline): Fix fixed point multiplication routines on systems without 64 bit long long type. (SFNT_ENABLE_HINTING, struct sfnt_test_dcontext, sfnt_test_move_to) (sfnt_test_line_to, sfnt_test_curve_to, sfnt_test_get_glyph) (sfnt_test_free_glyph, sfnt_test_span, sfnt_test_edge_ignore) (sfnt_read_cvt_table, sfnt_test_edge, sfnt_test_raster) (sfnt_read_fpgm_table, struct sfnt_unit_vector) (struct sfnt_interpreter_definition) (struct sfnt_interpreter_graphics_state, struct sfnt_interpreter) (sfnt_div_f26dot6, sfnt_mul_f26dot6, sfnt_floor_f26dot6) (sfnt_ceil_f26dot6, sfnt_round_f26dot6, sfnt_init_graphics_state) (sfnt_make_interpreter, enum sfnt_interpreter_run_context) (sfnt_interpret_trap, STACKSIZE, sfnt_set_srounding_state) (sfnt_skip_code, sfnt_interpret_unimplemented, sfnt_interpret_fdef) (sfnt_interpret_idef, sfnt_interpret_if, sfnt_interpret_else) (sfnt_round_none, sfnt_round_to_grid, sfnt_round_to_double_grid) (sfnt_round_down_to_grid, sfnt_round_up_to_grid) (sfnt_round_to_half_grid, sfnt_round_super, sfnt_validate_gs) (sfnt_interpret_run, sfnt_interpret_font_program) (test_interpreter_profile, test_cvt_values, test_interpreter_cvt) (test_interpreter_head, sfnt_make_test_interpreter) (struct sfnt_interpreter_test, sfnt_run_interpreter_test) (struct sfnt_generic_test_args, sfnt_generic_check) (sfnt_check_srp0, sfnt_check_szp0, sfnt_check_sloop) (struct sfnt_rounding_test_args, sfnt_check_rounding) (sfnt_check_smd, sfnt_check_scvtci, sfnt_check_sswci) (sfnt_check_ssw, sfnt_check_flipon, sfnt_check_flipoff) (npushb_test_args, npushw_test_args, pushb_test_args) (pushw_test_args, stack_overflow_test_args) (stack_underflow_test_args, rtg_test_args, rtg_symmetric_test_args) (rtg_1_test_args, rtg_1_symmetric_test_args, rthg_test_args) (rthg_1_test_args, rtdg_test_args, rtdg_1_test_args) (rtdg_2_test_args, rtdg_3_test_args, else_test_args) (jmpr_test_args, dup_test_args, pop_test_args, clear_test_args) (swap_test_args, depth_test_args, cindex_test_args) (mindex_test_args, raw_test_args, loopcall_test_args) (call_test_args, fdef_test_args, fdef_1_test_args, endf_test_args) (ws_test_args, rs_test_args, wcvtp_test_args, rcvt_test_args) (mppem_test_args, mps_test_args, debug_test_args, lt_test_args) (all_tests, main): Check in WIP hinting code. * src/sfnt.h (enum sfnt_table): Add `cvt ' and `fpgm' tables. --- cross/ndk-build/ndk-build-shared-library.mk | 2 +- cross/ndk-build/ndk-build-static-library.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cross') diff --git a/cross/ndk-build/ndk-build-shared-library.mk b/cross/ndk-build/ndk-build-shared-library.mk index a63bf90b042..5842486a1af 100644 --- a/cross/ndk-build/ndk-build-shared-library.mk +++ b/cross/ndk-build/ndk-build-shared-library.mk @@ -50,7 +50,7 @@ $(call objname,$(LOCAL_MODULE),$(basename $(1))): $(LOCAL_PATH)/$(1) $(NDK_BUILD_CC) -c $$< -o $$@ $(NDK_ASFLAGS_$(LOCAL_MODULE)) else -ifneq (x.$(suffix $(1)),x.asm) +ifneq (x$(suffix $(1)),x.asm) $$(error Unsupported suffix: $(suffix $(1))) else ifneq (x$(LOCAL_ASM_RULE_DEFINED),x) diff --git a/cross/ndk-build/ndk-build-static-library.mk b/cross/ndk-build/ndk-build-static-library.mk index e6e2d2810fb..f6df38e4c0b 100644 --- a/cross/ndk-build/ndk-build-static-library.mk +++ b/cross/ndk-build/ndk-build-static-library.mk @@ -42,7 +42,7 @@ $(call objname,$(LOCAL_MODULE),$(basename $(1))): $(LOCAL_PATH)/$(1) $(NDK_BUILD_CC) -c $$< -o $$@ $(NDK_ASFLAGS_$(LOCAL_MODULE)) else -ifneq (x.$(suffix $(1)),x.asm) +ifneq (x$(suffix $(1)),x.asm) $$(error Unsupported suffix: $(suffix $(1))) else ifneq (x$(LOCAL_ASM_RULE_DEFINED),x) -- cgit v1.2.3